diff --git a/HISTORY.md b/HISTORY.md index 22efd85bd6..7bb236717b 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,111 @@ # Keyman Version History +## 18.0.94 alpha 2024-08-21 + +* fix(core): look for `emcc` instead of `emcc.py` (#12235) +* fix(web): improve tokenization output when wordbreaker breaks spec for span properties in output (#12229) +* chore(android): Use RTL-aware alignment and padding for layouts (#12225) +* fix(web): disable fat-finger data use when mayCorrect = false (#12220) +* fix(android): Auto-mirror back and forward arrows for RTL support (#12227) +* feat(android): Add localization for Arabic (#12228) +* fix(android): Auto-mirror increment and decrement arrows for RTL support (#12230) + +## 18.0.93 alpha 2024-08-20 + +* (#12188) +* fix(web): fix malformed reversion display strings (#12201) +* feat(android): Add menu to specify long-press delay (#12170) +* feat(android): Pass longpress delay to KeymanWeb (#12185) +* (#12223) + +## 18.0.92 alpha 2024-08-19 + +* chore(deps-dev): bump @75lb/deep-merge from 1.1.1 to 1.1.2 (#12118) +* chore(deps): bump semver from 7.5.4 to 7.6.0 (#12119) +* fix(windows): "Keyman" is not localized in UI strings (#12162) +* feat(android): Enhance how ENTER key is handled in apps (#12125) +* refactor(web): move `lm-worker` → `worker-thread` (#12150) +* fix(developer): remove redundant check in LdmlKeyboardCompiler.validate() (#11858) + +## 18.0.91 alpha 2024-08-16 + +* refactor(web): move `predictive-text` → `worker-main` (#12146) +* fix(web): restore flick functionality (#12187) +* refactor(web): move `lm-message-types` → `predictive-text/types` (#12149) +* fix(developer): enforce presence of kps Info.Description field in info compilers (#12204) +* fix(developer): enforce presence of Version field when FollowKeyboardVersion is not set, in package compiler (#12205) + +## 18.0.90 alpha 2024-08-15 + +* refactor(web): move parts of `keyboard-processor` → `js-processor` (#12111) +* fix(web): allow `lm-worker` to build on Linux (#12181) +* refactor(web): move remaining parts of `keyboard-processor` → `keyboard` (#12131) +* docs: update .kmx documentation around bitmaps, modifier state (#12183) +* refactor(web): rename `package-cache` → `keyboard-storage` (#12135) + +## 18.0.89 alpha 2024-08-14 + +* feat(web): test skipped prediction round handling (#12169) +* fix(web): support live configuration of longpress delay (#12175) +* feat(web): add osk.gestureParams for better gesture-config persistence (#12176) +* refactor(core): move utfcodec to common (#12171) +* refactor: move kmx_u16 to common and rename to km_u16 (#12177) +* refactor(developer): use npm or local source for server addons instead of github references (#12090) +* fix(developer): fix crash with Windows Clipboard by ignoring zero scan code in debugger (#12166) +* chore(developer): update SIL logo (#12168) + +## 18.0.88 alpha 2024-08-13 + +* docs: add .kmx specification (#12163) + +## 18.0.87 alpha 2024-08-12 + +* chore(web): drop flaky auto-test component (#12155) +* fix(common): show description even if child projects specifies path (#12145) + +## 18.0.86 alpha 2024-08-09 + +* chore(android): Update splash screen with SIL Tai Heritage Pro logo (#12127) +* chore(common): Update localization for Greek Polytonic (#12112) +* chore(common): add support for build target platform exclusions (#12113) +* feat(common): add top-level build.sh (#12114) +* chore(developer): start building Developer on linux,mac (#12117) +* refactor(web): Move `common/web/recorder` → `web/src/tools/testing/recorder-core` (#12092) + +## 18.0.85 alpha 2024-08-08 + +* fix(developer): update date for last git commit date fixture (#12122) +* refactor(android/engine): Parse keyboards.json for FirstVoices app (#11943) + +## 18.0.84 alpha 2024-08-07 + +* refactor(common): move kpj-related files into developer-utils (#11531) +* refactor(common): move kps-file.ts to @keymanapp/developer-utils (#11763) +* refactor(common): move kvks-file to @keymanapp/developer-utils (#11764) +* refactor(common): move .keyman-touch-layout reader/writer to @keymanapp/developer-utils (#11765) +* refactor(common): move LDML keyboard .xml reader/writer and kmx-plus builder to @keymanapp/developer-utils (#12081) +* refactor(common): move compiler-interfaces to @keymanapp/developer-utils (#12088) +* refactor(common): move xml2js and related deps to @keymanapp/developer-utils (#12101) + +## 18.0.83 alpha 2024-08-06 + +* chore(common): Update history from 17.0.328 (#12093) +* change(common/models): change model tokenization to also tokenize whitespace (#11975) +* feat(web): support transform tokenization when given a root context (#11998) +* change(web): track whitespace-aware tokenization for context + correction-search caching (#11979) +* change(web): leverage tokenization to preserve punctuation and whitespace when predicting (#11997) +* fix(web): patch up worker build to provide artifacts for its tests (#12082) +* chore(web): move `web/src/engine/paths/` → `web/src/engine/interfaces/` (#12064) +* chore(web): move `common/web/input-processor/` → `web/src/engine/main/` (#12066) +* refactor(web): refactor and harmonize constants (#12072) +* chore(common): add data versions to minimum-versions.inc.sh (#12103) +* fix(web): fix lm-worker test broken by botched merge conflict resolution (#12104) + +## 18.0.82 alpha 2024-08-05 + +* chore(windows): remove QIT_VSHIFTDOWN QIT _VSHIFTUP (#11973) +* chore(developer): add language/reference (#11799) + ## 18.0.81 alpha 2024-08-03 * chore(developer): Revert "chore(developer): remove redundant references from tsconfig.json" (#12076) @@ -138,7 +244,7 @@ ## 18.0.63 alpha 2024-06-26 -* feat(linux): implement Linux side of SimulateAltGr option :checkered_flag: (#11852) +* feat(linux): implement Linux side of SimulateAltGr option (#11852) ## 18.0.62 alpha 2024-06-25 @@ -150,8 +256,8 @@ * feat(web): optimization via lazy preprocessing of keyboard touch-layout info (#11265) * fix(android): clear globe highlight when displaying keyboard picker (#11826) -* refactor(linux): add KeymanOption class for options :checkered_flag: (#11850) -* refactor(linux): rename methods that deal with keyboard options :checkered_flag: (#11851) +* refactor(linux): add KeymanOption class for options (#11850) +* refactor(linux): rename methods that deal with keyboard options (#11851) ## 18.0.60 alpha 2024-06-21 @@ -566,6 +672,10 @@ * chore(common): move to 18.0 alpha (#10713) * chore: move to 18.0 alpha +## 17.0.328 stable 2024-07-27 + +* fix(web): add nullish test in setOsk (#12041) + ## 17.0.327 stable 2024-07-25 * fix(android): include DOMRect polyfill for older ES6-supporting devices (#11654) diff --git a/LICENSE.md b/LICENSE.md index e031c6cc13..5b20376235 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # License -Copyright (c) 2017-2022 SIL International. All rights reserved. +Copyright (c) 2017-2024 SIL Global. All rights reserved. Licensed under the MIT License. @@ -10,7 +10,7 @@ Licensed under the MIT License. The MIT License -Copyright (c) 2017-2022 SIL International +Copyright (c) 2017-2024 SIL Global Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index acd890cc45..caab39c2f9 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # License -Copyright (c) SIL International. +Copyright (c) SIL Global. Keyman is an open source project distributed under the [MIT license](LICENSE.md). diff --git a/VERSION.md b/VERSION.md index 716c613096..a41e5425c0 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.82 \ No newline at end of file +18.0.95 \ No newline at end of file diff --git a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml index 7196abdb22..3ba7eaf9fc 100644 --- a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml +++ b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml @@ -297,6 +297,11 @@ android:configChanges="orientation" android:label="@string/app_name" android:theme="@style/AppTheme.Base" /> + diff --git a/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java b/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java index c6885b2b56..4fb1c56792 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java +++ b/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java @@ -4,6 +4,7 @@ package com.keyman.android; +import com.tavultesoft.kmapro.AdjustLongpressDelayActivity; import com.tavultesoft.kmapro.BuildConfig; import com.tavultesoft.kmapro.DefaultLanguageResource; import com.tavultesoft.kmapro.KeymanSettingsActivity; @@ -175,6 +176,9 @@ public class SystemKeyboard extends InputMethodService implements OnKeyboardEven } } + // Determine special handling for ENTER key + KMManager.setEnterMode(attribute.imeOptions, inputType); + InputConnection ic = getCurrentInputConnection(); if (ic != null) { ExtractedText icText = ic.getExtractedText(new ExtractedTextRequest(), 0); @@ -244,6 +248,8 @@ public class SystemKeyboard extends InputMethodService implements OnKeyboardEven if (exText != null) exText = null; } + // Initialize keyboard options + KMManager.sendOptionsToKeyboard(); } @Override diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/AdjustLongpressDelayActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/AdjustLongpressDelayActivity.java new file mode 100644 index 0000000000..2ecf62fe09 --- /dev/null +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/AdjustLongpressDelayActivity.java @@ -0,0 +1,149 @@ +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * (Optional description of this file) + */ +package com.tavultesoft.kmapro; + +import android.content.Context; +import android.content.SharedPreferences; +import android.graphics.drawable.ColorDrawable; +import android.os.Bundle; +import android.view.View; +import android.widget.SeekBar; +import android.widget.TextView; + +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.Toolbar; +import androidx.core.content.ContextCompat; + +import com.keyman.engine.BaseActivity; +import com.keyman.engine.KMManager; + +/** + * Settings menu for adjusting the longpress delay time. The value for the current longpress delay time + * is saved in shared preferences as an integer (milliseconds). + */ +public class AdjustLongpressDelayActivity extends BaseActivity { + private static final String TAG = "AdjustLongpressDelay"; + public static final String adjustLongpressDelayKey = "AdjustLongpressDelay"; + + // Keeps track of the adjusted longpress delay time for saving. + // Internally use milliseconds, but GUI displays seconds + private static int currentDelayTimeMS = KMManager.KMDefault_LongpressDelay; // ms + private static int minLongpressTime = 300; // ms + private static int maxLongpressTime = 1500; // ms + private static int delayTimeIncrement = 200; // ms + + /** + * Convert currentDelayTimeMS to progress + * @return int + */ + private int delayTimeToProgress() { + return (currentDelayTimeMS / delayTimeIncrement) - 1; + } + + /** + * Convert progress to currentDelayTimeMS + * @param progress + * @return int (milliseconds) + */ + private int progressToDelayTime(int progress) { + return (progress + 1) * delayTimeIncrement + 100; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + final Context context = this; + + setContentView(R.layout.activity_adjust_longpress_delay); + Toolbar toolbar = (Toolbar) findViewById(R.id.titlebar); + setSupportActionBar(toolbar); + ActionBar actionBar = getSupportActionBar(); + if (actionBar != null) { + actionBar.setTitle(null); + actionBar.setDisplayUseLogoEnabled(false); + actionBar.setDisplayHomeAsUpEnabled(true); + actionBar.setDisplayShowHomeEnabled(true); + actionBar.setDisplayShowTitleEnabled(false); + actionBar.setDisplayShowCustomEnabled(true); + actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.keyman_blue))); + } + + TextView adjustLongpressDelayActivityTitle = (TextView) findViewById(R.id.bar_title); + + String titleStr = getString(R.string.adjust_longpress_delay); + adjustLongpressDelayActivityTitle.setTextColor(ContextCompat.getColor(this, R.color.ms_white)); + adjustLongpressDelayActivityTitle.setText(titleStr); + + currentDelayTimeMS = KMManager.getLongpressDelay(); + + TextView adjustLongpressDelayText = (TextView) findViewById(R.id.delayTimeText); + String longpressDelayTextSeconds = String.format(getString(R.string.longpress_delay_time), (float)(currentDelayTimeMS/1000.0)); + adjustLongpressDelayText.setTextAlignment(View.TEXT_ALIGNMENT_CENTER); + adjustLongpressDelayText.setText(longpressDelayTextSeconds); + + final SeekBar seekBar = (SeekBar) findViewById(R.id.seekBar); + seekBar.setProgress(delayTimeToProgress()); + seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { + + @Override + public void onStopTrackingTouch(SeekBar seekBar) { + // Do nothing + } + + @Override + public void onStartTrackingTouch(SeekBar seekBar) { + // Do nothing + } + + @Override + public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { + // Update the text field. + // The keyboard options will be saved and sent to KeymanWeb when exiting the menu + currentDelayTimeMS = progressToDelayTime(progress); + String longpressDelayTextSeconds = String.format(getString(R.string.longpress_delay_time), (float)(currentDelayTimeMS/1000.0)); + adjustLongpressDelayText.setText(longpressDelayTextSeconds); + } + }); + + findViewById(R.id.delayTimeDownButton).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (currentDelayTimeMS > minLongpressTime) { + currentDelayTimeMS -= delayTimeIncrement; + seekBar.setProgress(delayTimeToProgress()); + } + } + }); + + findViewById(R.id.delayTimeUpButton).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (currentDelayTimeMS < maxLongpressTime) { + currentDelayTimeMS += delayTimeIncrement; + seekBar.setProgress(delayTimeToProgress()); + } + } + }); + } + + @Override + public void onBackPressed() { + // Store the longpress delay as a reference + // and then update KeymanWeb with the longpress delay + KMManager.setLongpressDelay(currentDelayTimeMS); + KMManager.sendOptionsToKeyboard(); + + super.onBackPressed(); + } + + @Override + public boolean onSupportNavigateUp() { + onBackPressed(); + return true; + } + +} diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeyboardSettingsActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeyboardSettingsActivity.java index 0989bf0d08..689548a56e 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeyboardSettingsActivity.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeyboardSettingsActivity.java @@ -105,7 +105,7 @@ public final class KeyboardSettingsActivity extends AppCompatActivity { hashMap = new HashMap<>(); final String customHelpLink = kbd.getHelpLink(); // Check if app declared FileProvider - icon = String.valueOf(R.drawable.ic_arrow_forward); + icon = String.valueOf(R.drawable.ic_action_forward); // Don't show help link arrow if File Provider unavailable, or custom help doesn't exist if ( (customHelpLink != null && !FileProviderUtils.exists(context)) || (customHelpLink == null && !packageID.equals(KMManager.KMDefault_UndefinedPackageID)) ) { diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsFragment.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsFragment.java index 72c54aa0d0..95bb7774b0 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsFragment.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsFragment.java @@ -28,7 +28,7 @@ public class KeymanSettingsFragment extends PreferenceFragmentCompat { private static Context context; private Preference languagesPreference, installKeyboardOrDictionary, displayLanguagePreference, - adjustKeyboardHeight; + adjustKeyboardHeight, adjustLongpressDelay; private ListPreference spacebarTextPreference; private CheckBoxPreference setSystemKeyboardPreference; private CheckBoxPreference setDefaultKeyboardPreference; @@ -99,6 +99,7 @@ public class KeymanSettingsFragment extends PreferenceFragmentCompat { }); setDefaultKeyboardPreference.setOnPreferenceChangeListener(checkBlocker); + adjustKeyboardHeight = new Preference(context); adjustKeyboardHeight.setKey(AdjustKeyboardHeightActivity.adjustKeyboardHeightKey); adjustKeyboardHeight.setTitle(getString(R.string.adjust_keyboard_height)); @@ -106,6 +107,13 @@ public class KeymanSettingsFragment extends PreferenceFragmentCompat { Intent adjustKeyboardHeightIntent = new Intent(context, AdjustKeyboardHeightActivity.class); adjustKeyboardHeight.setIntent(adjustKeyboardHeightIntent); + adjustLongpressDelay = new Preference(context); + adjustLongpressDelay.setKey(AdjustLongpressDelayActivity.adjustLongpressDelayKey); + adjustLongpressDelay.setTitle(getString(R.string.adjust_longpress_delay)); + adjustLongpressDelay.setWidgetLayoutResource(R.layout.preference_duration_icon_layout); + Intent adjustLongpressDelayIntent = new Intent(context, AdjustLongpressDelayActivity.class); + adjustLongpressDelay.setIntent(adjustLongpressDelayIntent); + /* Spacebar Caption Preference */ spacebarTextPreference = new ListPreference(context); @@ -188,8 +196,6 @@ public class KeymanSettingsFragment extends PreferenceFragmentCompat { sendCrashReportPreference.setSummaryOff(getString(R.string.show_send_crash_report_off)); sendCrashReportPreference.setDefaultValue(true); - - screen.addPreference(languagesPreference); screen.addPreference(installKeyboardOrDictionary); screen.addPreference(displayLanguagePreference); @@ -197,6 +203,7 @@ public class KeymanSettingsFragment extends PreferenceFragmentCompat { screen.addPreference(setDefaultKeyboardPreference); screen.addPreference(adjustKeyboardHeight); + screen.addPreference(adjustLongpressDelay); screen.addPreference(spacebarTextPreference); screen.addPreference(hapticFeedbackPreference); diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/LanguageSettingsActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/LanguageSettingsActivity.java index faa3e0efbf..75116bad8c 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/LanguageSettingsActivity.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/LanguageSettingsActivity.java @@ -174,7 +174,7 @@ public final class LanguageSettingsActivity extends AppCompatActivity { updateActiveLexicalModel(); ImageView imageView = (ImageView) layout.findViewById(R.id.image1); - imageView.setImageResource(R.drawable.ic_arrow_forward); + imageView.setImageResource(R.drawable.ic_action_forward); layout.setEnabled(true); layout.setOnClickListener(new View.OnClickListener() { @Override @@ -198,7 +198,7 @@ public final class LanguageSettingsActivity extends AppCompatActivity { * textView = (TextView) layout.findViewById(R.id.text1); * textView.setText(getString(R.string.manage_dictionary)); * imageView = (ImageView) layout.findViewById(R.id.image1); - * imageView.setImageResource(R.drawable.ic_arrow_forward); + * imageView.setImageResource(R.drawable.ic_action_forward); */ listView.setAdapter(adapter); @@ -346,7 +346,7 @@ public final class LanguageSettingsActivity extends AppCompatActivity { } holder.text.setText(kbd.getResourceName()); - holder.img.setImageResource(R.drawable.ic_arrow_forward); + holder.img.setImageResource(R.drawable.ic_action_forward); return convertView; } diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/LanguagesSettingsActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/LanguagesSettingsActivity.java index 7b621da4b7..6e21d04f7b 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/LanguagesSettingsActivity.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/LanguagesSettingsActivity.java @@ -203,7 +203,7 @@ public final class LanguagesSettingsActivity extends AppCompatActivity { } holder.textLang.setText(data.name); - holder.img.setImageResource(R.drawable.ic_arrow_forward); + holder.img.setImageResource(R.drawable.ic_action_forward); holder.textCount.setText(getContext().getResources().getQuantityString(R.plurals.keyboard_count, data.keyboards.size(), data.keyboards.size())); diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java index 1e5231f521..2ae689364c 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java @@ -472,7 +472,8 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene @Override public void onKeyboardLoaded(KeyboardType keyboardType) { - // Do nothing + // Initialize keyboard options + KMManager.sendOptionsToKeyboard(); } @Override @@ -646,7 +647,7 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene final View textSizeController = inflater.inflate(R.layout.text_size_controller, null); final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(MainActivity.this); dialogBuilder.setIcon(R.drawable.ic_light_action_textsize); - dialogBuilder.setTitle(String.format(getString(R.string.text_size), textSize)); + dialogBuilder.setTitle(getTextSizeString()); dialogBuilder.setView(textSizeController); dialogBuilder.setPositiveButton(getString(R.string.label_ok), new DialogInterface.OnClickListener() { @Override @@ -677,7 +678,7 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { textSize = progress + minTextSize; textView.setTextSize((float) textSize); - dialog.setTitle(String.format(getString(R.string.text_size), textSize)); + dialog.setTitle(getTextSizeString()); } }); @@ -702,6 +703,16 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene }); } + /** + * Combine a localized string for "Text Size" plus Arabic numerals + * @return String + */ + private String getTextSizeString() { + // Instead of formatting the number, will truncate formatting and concat the actual textSize + String label = getString(R.string.text_size).replace("%1$d", ""); + return label + KMString.format(" %d", textSize); + } + private void showClearTextDialog() { AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(MainActivity.this); dialogBuilder.setIcon(R.drawable.ic_light_action_trash); diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/SelectPackageActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/SelectPackageActivity.java index 46bc68ca1a..9b05332182 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/SelectPackageActivity.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/SelectPackageActivity.java @@ -81,7 +81,7 @@ public final class SelectPackageActivity extends AppCompatActivity { HashMap hashMap = new HashMap<>(); hashMap.put(titleKey, keyboardName); hashMap.put(subtitleKey, pkgID); - String icon = String.valueOf(R.drawable.ic_arrow_forward); + String icon = String.valueOf(R.drawable.ic_action_forward); hashMap.put(iconKey, icon); list.add(hashMap); } diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-hdpi/sil_logo_blue_2017_1.9.png b/android/KMAPro/kMAPro/src/main/res/drawable-hdpi/sil_logo_blue_2017_1.9.png deleted file mode 100644 index ddc2905347..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/res/drawable-hdpi/sil_logo_blue_2017_1.9.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-hdpi/sil_logo_color_tai_heritage_pro.9.png b/android/KMAPro/kMAPro/src/main/res/drawable-hdpi/sil_logo_color_tai_heritage_pro.9.png new file mode 100644 index 0000000000..8f25377aa8 Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/res/drawable-hdpi/sil_logo_color_tai_heritage_pro.9.png differ diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-mdpi/sil_logo_blue_2017_1.9.png b/android/KMAPro/kMAPro/src/main/res/drawable-mdpi/sil_logo_blue_2017_1.9.png deleted file mode 100644 index 0e720d69a1..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/res/drawable-mdpi/sil_logo_blue_2017_1.9.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-mdpi/sil_logo_color_tai_heritage_pro.9.png b/android/KMAPro/kMAPro/src/main/res/drawable-mdpi/sil_logo_color_tai_heritage_pro.9.png new file mode 100644 index 0000000000..24cc6b9c92 Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/res/drawable-mdpi/sil_logo_color_tai_heritage_pro.9.png differ diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-xhdpi/sil_logo_blue_2017_1.9.png b/android/KMAPro/kMAPro/src/main/res/drawable-xhdpi/sil_logo_blue_2017_1.9.png deleted file mode 100644 index 17f25f6cce..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/res/drawable-xhdpi/sil_logo_blue_2017_1.9.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-xhdpi/sil_logo_color_tai_heritage_pro.9.png b/android/KMAPro/kMAPro/src/main/res/drawable-xhdpi/sil_logo_color_tai_heritage_pro.9.png new file mode 100644 index 0000000000..308a7c6f9a Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/res/drawable-xhdpi/sil_logo_color_tai_heritage_pro.9.png differ diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-xxhdpi/sil_logo_blue_2017_1.9.png b/android/KMAPro/kMAPro/src/main/res/drawable-xxhdpi/sil_logo_blue_2017_1.9.png deleted file mode 100644 index 014572d691..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/res/drawable-xxhdpi/sil_logo_blue_2017_1.9.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-xxhdpi/sil_logo_color_tai_heritage_pro.9.png b/android/KMAPro/kMAPro/src/main/res/drawable-xxhdpi/sil_logo_color_tai_heritage_pro.9.png new file mode 100644 index 0000000000..eee36efdec Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/res/drawable-xxhdpi/sil_logo_color_tai_heritage_pro.9.png differ diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-xxxhdpi/sil_logo_blue_2017_1.9.png b/android/KMAPro/kMAPro/src/main/res/drawable-xxxhdpi/sil_logo_blue_2017_1.9.png deleted file mode 100644 index 04366bd151..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/res/drawable-xxxhdpi/sil_logo_blue_2017_1.9.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-xxxhdpi/sil_logo_color_tai_heritage_pro.9.png b/android/KMAPro/kMAPro/src/main/res/drawable-xxxhdpi/sil_logo_color_tai_heritage_pro.9.png new file mode 100644 index 0000000000..3dec6473b9 Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/res/drawable-xxxhdpi/sil_logo_color_tai_heritage_pro.9.png differ diff --git a/android/KMAPro/kMAPro/src/main/res/drawable/branded_logo.xml b/android/KMAPro/kMAPro/src/main/res/drawable/branded_logo.xml index cb6b2cbabf..2f5d1eca2b 100644 --- a/android/KMAPro/kMAPro/src/main/res/drawable/branded_logo.xml +++ b/android/KMAPro/kMAPro/src/main/res/drawable/branded_logo.xml @@ -15,7 +15,7 @@ diff --git a/android/KMAPro/kMAPro/src/main/res/drawable/ic_action_back.xml b/android/KMAPro/kMAPro/src/main/res/drawable/ic_action_back.xml deleted file mode 100644 index 165d535d3d..0000000000 --- a/android/KMAPro/kMAPro/src/main/res/drawable/ic_action_back.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/android/KMAPro/kMAPro/src/main/res/drawable/ic_action_decrement.xml b/android/KMAPro/kMAPro/src/main/res/drawable/ic_action_decrement.xml new file mode 100644 index 0000000000..c3085bec5e --- /dev/null +++ b/android/KMAPro/kMAPro/src/main/res/drawable/ic_action_decrement.xml @@ -0,0 +1,5 @@ + + diff --git a/android/KMAPro/kMAPro/src/main/res/drawable/ic_action_increment.xml b/android/KMAPro/kMAPro/src/main/res/drawable/ic_action_increment.xml new file mode 100644 index 0000000000..ea188f818f --- /dev/null +++ b/android/KMAPro/kMAPro/src/main/res/drawable/ic_action_increment.xml @@ -0,0 +1,5 @@ + + diff --git a/android/KMAPro/kMAPro/src/main/res/drawable/ic_action_timelapse.xml b/android/KMAPro/kMAPro/src/main/res/drawable/ic_action_timelapse.xml new file mode 100644 index 0000000000..80dc29e33f --- /dev/null +++ b/android/KMAPro/kMAPro/src/main/res/drawable/ic_action_timelapse.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/android/KMAPro/kMAPro/src/main/res/layout/activity_adjust_longpress_delay.xml b/android/KMAPro/kMAPro/src/main/res/layout/activity_adjust_longpress_delay.xml new file mode 100644 index 0000000000..ed0bed54a9 --- /dev/null +++ b/android/KMAPro/kMAPro/src/main/res/layout/activity_adjust_longpress_delay.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + diff --git a/android/KMAPro/kMAPro/src/main/res/layout/activity_info.xml b/android/KMAPro/kMAPro/src/main/res/layout/activity_info.xml index 59de518535..3b71e87178 100644 --- a/android/KMAPro/kMAPro/src/main/res/layout/activity_info.xml +++ b/android/KMAPro/kMAPro/src/main/res/layout/activity_info.xml @@ -19,11 +19,12 @@ + android:src="@drawable/ic_action_back" /> + android:src="@drawable/ic_action_forward" /> + android:src="@drawable/ic_action_back" /> + android:src="@drawable/ic_action_forward" /> + diff --git a/android/KMAPro/kMAPro/src/main/res/layout/preference_icon_layout.xml b/android/KMAPro/kMAPro/src/main/res/layout/preference_icon_layout.xml index 6aa84ce384..7074c696de 100644 --- a/android/KMAPro/kMAPro/src/main/res/layout/preference_icon_layout.xml +++ b/android/KMAPro/kMAPro/src/main/res/layout/preference_icon_layout.xml @@ -2,4 +2,4 @@ + android:src="@drawable/ic_action_forward" /> diff --git a/android/KMAPro/kMAPro/src/main/res/layout/text_size_controller.xml b/android/KMAPro/kMAPro/src/main/res/layout/text_size_controller.xml index 2245ef557a..c250b1bf07 100644 --- a/android/KMAPro/kMAPro/src/main/res/layout/text_size_controller.xml +++ b/android/KMAPro/kMAPro/src/main/res/layout/text_size_controller.xml @@ -15,7 +15,7 @@ android:layout_marginStart="5dp" android:layout_marginEnd="5dp" android:contentDescription="@string/ic_text_size_down" - android:src="@drawable/ic_light_dialog_textsize_down" /> + android:src="@drawable/ic_action_decrement" /> + android:src="@drawable/ic_action_increment" /> diff --git a/android/KMAPro/kMAPro/src/main/res/layout/web_browser_bar_layout.xml b/android/KMAPro/kMAPro/src/main/res/layout/web_browser_bar_layout.xml index 2e9b059c55..749412e067 100644 --- a/android/KMAPro/kMAPro/src/main/res/layout/web_browser_bar_layout.xml +++ b/android/KMAPro/kMAPro/src/main/res/layout/web_browser_bar_layout.xml @@ -15,7 +15,6 @@ android:layout_height="match_parent" android:layout_margin="3dp" android:padding="4dp" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_above="@+id/progressBar" android:weightSum="2" @@ -76,7 +75,6 @@ style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal" android:layout_width="match_parent" android:layout_height="@dimen/keyman_bar_height" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_alignParentBottom="true" android:visibility="visible" diff --git a/android/KMAPro/kMAPro/src/main/res/values-ar-rSA/strings.xml b/android/KMAPro/kMAPro/src/main/res/values-ar-rSA/strings.xml new file mode 100644 index 0000000000..6ceb657187 --- /dev/null +++ b/android/KMAPro/kMAPro/src/main/res/values-ar-rSA/strings.xml @@ -0,0 +1,168 @@ + + + + + مشاركة + + متصفح ويب + + حجم النص + + المزيد + + محو النص + + معلومات + + الإعدادات + + تنزيل التحديثات + + إصدار: %1$s + + يتطلب Keyman إصدار 57 من Chrome أو أعلى. + + تحديث Chrome + + ابدأ الكتابة هنا… + + + + حجم النص: %1$d + + تكبير حجم النص + + تصغير حجم النص + + Text size slider + + \nسيتم محو كل النص\n + + إبدأ الآن + + اضف لوحة مفاتيح بلغتك + + تمكين Keyman لوحة المفاتيح الأساسية للنظام + + إعداد Keyman لوحة المفاتيح الإفتراضية + + المزيد من المعلومات + + أظهر \"%1$s\" عند البدء + + لتثبيت حزم لوحات المفاتيح، امنح Keyman الإذن لقراءة التخزين الخارجي. + + تم رفض أذونات التخزين. قد يفشل تثبيت حزمة لوحة المفاتيح + Storage permission request failed. Try Keyman Settings - Install from local file + + الإعدادات + + + اللغات المثبتة (%1$d) + اللغات المثبتة (%1$d) + اللغات المثبتة (%1$d) + اللغات المثبتة (%1$d) + اللغات المثبتة (%1$d) + اللغات المثبتة (%1$d) + + + تثبيت لوحة المفاتيح او القاموس + + لغة العرض + + تعديل ارتفاع لوحة المفاتيح + + نص مفتاح المسافة + + لوحة المفاتيح + + اللغة + + اللغة + لوحة المفاتيح + + فارغ + + أظهر اسم لوحة المفاتيح على مفتاح المسافة + + أظهر اسم اللغة على المسافة + + اللغة ولوحة المفاتيح على المسافة + + لا تظهر نص على المسافة + + الاهتزاز عند الكتابة + + إظهار اللافتة دائماً + + سيتم تنفيذها + + عند إيقاف التشغيل، يظهر فقط عند تفعيل النص التنبؤي + + السماح بإرسال تقارير توقف التشغيل المفاجئ عبر الشبك + + عند التشغيل، سيتم إرسال تقارير التوقف المفاجئ + + عند إيقاف التشغيل، لن يتم إرسال التقارير + + تثبيت من keyman.com + + التثبيت من ملف محلي + + التثبيت من جهاز آخر + + اضف لغات للوحة المفاتيح المثبتة + + (من حزمة لوحة المفاتيح) + + اختر حزمة لوحة مفاتيح + + اختر لغة %1$s + + تمت اضافة %1$s إلى %2$s + + كل اللغات مثبتة مسبقا + + اسحب لوحة المفاتيح لتغيير مدى ارتفاعها + + دور الجهاز لضبط الوضع العمودي والوضع الأفقي + + إعادة ضبط الافتراضيات + + ابحث أو اكتب عنوان URL + + علامات مرجعية + + لا تتوفر أي علامات مرجعية + + أضف علامة مرجعية + + العنوان + + عنوان Url + + فشل في تنزيل حزمة %1$s + + يتم الآن تحميل لوحة مفاتيح حزمة \n%1$s… + + فشل في الإستخراج + + تثبيت لوحة المفاتيح + + تثبيت القاموس + + ليس %1$s ملف حزمة صالحة لبرنامج Keyman.\n%2$s\" + + ليس في حزمة لوحة المفاتيح لوحات مفاتيح مكيّفة لشاشات اللمس + + لا يوجد نصوص تنبؤية للتنزيل + + لا لوحات مفاتيح و نصوص تنبؤية للتنزيل + + ليس لحزمة لوحة المفاتيح لغات ذات صلة لتثبيتها + + غير صالح\ناقص البيانات الوصفية في الحزمة + + تتطلب لوحة المفاتيح إصدارًا أحدث من Keyman + + غير قادر على تشغيل متصفح الويب + diff --git a/android/KMAPro/kMAPro/src/main/res/values-b+el/strings.xml b/android/KMAPro/kMAPro/src/main/res/values-b+el/strings.xml index 43e43eb4ca..428bf5ad59 100644 --- a/android/KMAPro/kMAPro/src/main/res/values-b+el/strings.xml +++ b/android/KMAPro/kMAPro/src/main/res/values-b+el/strings.xml @@ -30,9 +30,9 @@ Μέγεθος κειμένου: %1$d - Μεγαλῶστε τὸ κείμενο + Μεγαλῶστε τὴν γραμματοσειρά - Μεγαλῶστε τὸ κείμενο + Μικρύνετε τὴν γραμματοσειρά Ρύθμιση μεγέθους κειμένου @@ -68,7 +68,7 @@ Μεταβολὴ ὕψους πληκτρολογίου - Spacebar caption + Λεζάντα πλήκτρου διαστήματος Πληκτρολόγιο @@ -80,9 +80,9 @@ \'Ονομα πληκτρολογίου στὸ πλῆκτρο διαστήματος - \'Ονομα γλώσσας στὸ πλῆκτρο διαστήματος + Ὄνομα γλώσσας στὸ πλῆκτρο διαστήματος - \'Ονομα πληκτρολογίου καὶ γλώσσας στὸ πλῆκτρο διαστήματος + Ὄνομα πληκτρολογίου καὶ γλώσσας στὸ πλῆκτρο διαστήματος Καμμία λεζάντα στὸ πλῆκτρο διαστήματος @@ -92,13 +92,13 @@ Πρὸς ὑλοποίησιν - Ὅταν εἶναι off, ἐμφανίζεται μόνο ὅταν ἔχει ἐνεργοποιηθεῖ τὸ προγνωστικὸ κείμενο + OFF: ἐμφάνιση μόνον ὅταν ἔχει ἐνεργοποιηθεῖ ἡ πρόβλεψη κειμένου Ἐπιτρέψτε τὴν ἀποστολὴ ἀναφορῶν κατάρρευσης μέσῳ δικτύου - Ὅταν εἶναι ΟΝ, θὰ ἀποστέλλονται ἀναφορὲς κατάρρευσης + ON: Ἀποστολὴ ἀναφορῶν κατάρρευσης - Ὅταν εἶναι off, δὲν θὰ ἀποστέλλονται ἀναφορὲς κατάρρευσης + OFF: Δὲν ἀποστέλλονται ἀναφορὲς κατάρρευσης Ἐγκατάσταση ἀπὸ τὸ keyman.com @@ -118,9 +118,9 @@ Ὅλες οἱ γλῶσσες ἔχουν ἤδη ἐγκατασταθεῖ - Σύρετε τὸ πληκτρολόγιο γιὰ νὰ ἀλλάξετε τὸ ὕψος + Σύρετε τὸ πληκτρολόγιο γιὰ νὰ ἀλλάξετε τὸ ὕψος του - Περιστρέψτε τὴν συσκευὴ γιὰ λειτουργία πορτραίτου καὶ τοπίου + Περιστρέψτε τὴν συσκευὴ γιὰ προσαρμογὴ τοῦ ὕψους σὲ λειτουργία πορτραίτου καὶ τοπίου Ἐπαναφέρετε τὶς προεπιλεγμένες ρυθμίσεις @@ -150,9 +150,9 @@ Τὸ πακέτο πληκτρολογίου δὲν ἔχει βελτιστοποιημένα πληκτρολόγια ἀφῆς πρὸς ἐγκατάστασιν - Δὲν ὑπάρχει νέο προγνωστικό κείμενο πρὸς ἐγκατάστασιν + Δὲν ὑπάρχουν προγνώσεις κειμένων πρὸς ἐγκατάστασιν - Δὲν ὑπάρχουν πληκτρολόγια ἢ προγνωστικό κείμενο πρὸς ἐγκατάστασιν + Δὲν ὑπάρχουν πληκτρολόγια ἢ προγνώσεις κειμένων πρὸς ἐγκατάστασιν Τὸ πακέτο πληκτρολογίου δὲν ἔχει σχετικὲς μὲ αὐτὸ γλῶσσες πρὸς ἐγκατάστασιν diff --git a/android/KMAPro/kMAPro/src/main/res/values/dimens.xml b/android/KMAPro/kMAPro/src/main/res/values/dimens.xml index cfcc2f4917..60e89def04 100644 --- a/android/KMAPro/kMAPro/src/main/res/values/dimens.xml +++ b/android/KMAPro/kMAPro/src/main/res/values/dimens.xml @@ -23,4 +23,5 @@ 32dp 16dp 0dp + 24sp diff --git a/android/KMAPro/kMAPro/src/main/res/values/strings.xml b/android/KMAPro/kMAPro/src/main/res/values/strings.xml index 3cec4f2558..a1f9e7240d 100644 --- a/android/KMAPro/kMAPro/src/main/res/values/strings.xml +++ b/android/KMAPro/kMAPro/src/main/res/values/strings.xml @@ -113,6 +113,9 @@ Adjust keyboard height + + Adjust longpress delay + Spacebar caption @@ -198,6 +201,17 @@ Reset to Defaults + + Delay Time: %1$.1f seconds + + + Delay time longer + + + Delay time shorter + + + Longpress delay time slider Search or type URL diff --git a/android/KMEA/app/src/main/assets/android-host.js b/android/KMEA/app/src/main/assets/android-host.js index 9c786e1777..62d396aae0 100644 --- a/android/KMEA/app/src/main/assets/android-host.js +++ b/android/KMEA/app/src/main/assets/android-host.js @@ -112,6 +112,17 @@ function notifyHost(event, params) { }, 10); } +// Update the KeymanWeb longpress delay +// delay is in milliseconds +function setLongpressDelay(delay) { + if (keyman.osk) { + keyman.osk.gestureParams.longpress.waitLength = delay; + console.debug('setLongpressDelay('+delay+')'); + } else { + window.console.log('setLongpressDelay error: keyman.osk undefined'); + } +} + // Update the KMW banner height // h is in dpi (different from iOS) function setBannerHeight(h) { diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/DisplayLanguages.java b/android/KMEA/app/src/main/java/com/keyman/engine/DisplayLanguages.java index 6a159523a2..4783e401b8 100644 --- a/android/KMEA/app/src/main/java/com/keyman/engine/DisplayLanguages.java +++ b/android/KMEA/app/src/main/java/com/keyman/engine/DisplayLanguages.java @@ -40,6 +40,7 @@ public class DisplayLanguages { DisplayLanguageType[] languages = { new DisplayLanguageType(unspecifiedLocale, context.getString(R.string.default_locale)), new DisplayLanguageType("am-ET", "አማርኛ (Amharic)"), + new DisplayLanguageType("ar-SA", "(Arabic) العربية"), new DisplayLanguageType("az-AZ", "Azərbaycanca (Azəricə)"), new DisplayLanguageType("bwr-NG", "Bura-Pabir"), new DisplayLanguageType("cs-CZ", "čeština (Czech)"), diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardJSHandler.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardJSHandler.java index 926ef094f7..d403a29235 100644 --- a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardJSHandler.java +++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardJSHandler.java @@ -20,6 +20,7 @@ import android.webkit.JavascriptInterface; import static android.content.Context.VIBRATOR_SERVICE; +import com.keyman.engine.KMManager.EnterModeType; import com.keyman.engine.KMManager.KeyboardType; import com.keyman.engine.data.Keyboard; import com.keyman.engine.util.CharSequenceUtil; @@ -153,7 +154,53 @@ public class KMKeyboardJSHandler { } if (s.length() > 0 && s.charAt(0) == '\n') { - keyDownUp(KeyEvent.KEYCODE_ENTER, 0); + if (k.keyboardType == KeyboardType.KEYBOARD_TYPE_SYSTEM) { + // Special handling of ENTER key + switch (KMManager.enterMode) { + // Go action + case GO : + ic.performEditorAction(EditorInfo.IME_ACTION_GO); + break; + + // Search action + case SEARCH : + ic.performEditorAction(EditorInfo.IME_ACTION_SEARCH); + break; + + // Send action + case SEND : + ic.performEditorAction(EditorInfo.IME_ACTION_SEND); + break; + + // Next action + case NEXT : + ic.performEditorAction(EditorInfo.IME_ACTION_NEXT); + break; + + // Done action + case DONE : + ic.performEditorAction(EditorInfo.IME_ACTION_DONE); + break; + + // Previous action + case PREVIOUS : + ic.performEditorAction(EditorInfo.IME_ACTION_PREVIOUS); + break; + + // Messaging apps + case NEWLINE : + // Send newline and advance cursor + ic.commitText("\n", 1); + break; + + // Default ENTER action + default: + keyDownUp(KeyEvent.KEYCODE_ENTER, 0); + } + } else { + // In-app keyboard uses default ENTER action + keyDownUp(KeyEvent.KEYCODE_ENTER, 0); + } ic.endBatchEdit(); return; } diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java index aa1c43626a..b921ac6c0a 100644 --- a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java +++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java @@ -25,7 +25,6 @@ import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.content.res.AssetManager; import android.content.res.Configuration; -import android.content.res.Resources; import android.graphics.Point; import android.graphics.Typeface; import android.inputmethodservice.InputMethodService; @@ -180,6 +179,19 @@ public final class KMManager { } } + // Enum for how the System Keyboard ENTER key is handled for the EditorInfo action + // Reference: https://developer.android.com/reference/android/view/inputmethod/EditorInfo#summary + public enum EnterModeType { + GO, // Go action + SEARCH, // Search action + SEND, // Send action + NEXT, // Next action + DONE, // Done action + PREVIOUS, // Previous action + NEWLINE, // Send newline character + DEFAULT, // Default ENTER action + } + protected static InputMethodService IMService; private static boolean debugMode = false; @@ -218,6 +230,9 @@ public final class KMManager { // regardless what the Settings preference is. private static boolean mayPredictOverride = false; + // Determine how system keyboard handles ENTER key + public static EnterModeType enterMode = EnterModeType.DEFAULT; + // Boolean for whether a keyboard can send embedded KMW crash reports to Sentry // When maySendCrashReport is false, KMW will still attempt to send crash reports, but it // will be blocked. @@ -248,6 +263,8 @@ public final class KMManager { public static final String KMKey_KeyboardHeightPortrait = "keyboardHeightPortrait"; public static final String KMKey_KeyboardHeightLandscape = "keyboardHeightLandscape"; + public static final String KMKey_LongpressDelay = "longpressDelay"; + public static final String KMKey_CustomHelpLink = "CustomHelpLink"; public static final String KMKey_KMPLink = "kmp"; public static final String KMKey_UserKeyboardIndex = "UserKeyboardIndex"; @@ -293,6 +310,9 @@ public final class KMManager { public static final String KMDefault_DictionaryVersion = "0.1.4"; public static final String KMDefault_DictionaryKMP = KMDefault_DictionaryPackageID + FileUtils.MODELPACKAGE; + // Default KeymanWeb longpress delay in milliseconds + public static final int KMDefault_LongpressDelay = 500; + // Keyman files protected static final String KMFilename_KeyboardHtml = "keyboard.html"; protected static final String KMFilename_JSEngine = "keymanweb-webview.js"; @@ -1251,6 +1271,61 @@ public final class KMManager { } } + /** + * Sets enterMode which specifies how the System keyboard ENTER key is handled + * + * @param imeOptions EditorInfo.imeOptions + * @param inputType InputType + */ + public static void setEnterMode(int imeOptions, int inputType) { + if ((inputType & InputType.TYPE_TEXT_FLAG_MULTI_LINE) != 0) { + enterMode = EnterModeType.NEWLINE; + return; + } + + int imeActions = imeOptions & EditorInfo.IME_MASK_ACTION; + EnterModeType value = EnterModeType.DEFAULT; + + switch (imeActions) { + case EditorInfo.IME_ACTION_GO: + value = EnterModeType.GO; + break; + + case EditorInfo.IME_ACTION_SEARCH: + value = EnterModeType.SEARCH; + break; + + case EditorInfo.IME_ACTION_SEND: + value = EnterModeType.SEND; + break; + + case EditorInfo.IME_ACTION_NEXT: + value = EnterModeType.NEXT; + break; + + case EditorInfo.IME_ACTION_DONE: + value = EnterModeType.DONE; + break; + + case EditorInfo.IME_ACTION_PREVIOUS: + value = EnterModeType.PREVIOUS; + break; + + default: + value = EnterModeType.DEFAULT; + } + + enterMode = value; + } + + /** + * Get the value of enterMode + * @return EnterModeType + */ + public static EnterModeType getEnterMode() { + return enterMode; + } + /** * Sets mayPredictOverride true if the InputType field is a hidden password text field * (either TYPE_TEXT_VARIATION_PASSWORD or TYPE_TEXT_VARIATION_WEB_PASSWORD @@ -2010,6 +2085,45 @@ public final class KMManager { return Configuration.ORIENTATION_UNDEFINED; } + /** + * Get the longpress delay (in milliseconds) from stored preference. Defaults to 500ms + * @return int - longpress delay in milliseconds + */ + public static int getLongpressDelay() { + SharedPreferences prefs = appContext.getSharedPreferences( + appContext.getString(R.string.kma_prefs_name), Context.MODE_PRIVATE); + + return prefs.getInt(KMKey_LongpressDelay, KMDefault_LongpressDelay); + } + + /** + * Set the longpress delay (in milliseconds) as a stored preference. + * @param longpressDelay - int longpress delay in milliseconds + */ + public static void setLongpressDelay(int longpressDelay) { + SharedPreferences prefs = appContext.getSharedPreferences( + appContext.getString(R.string.kma_prefs_name), Context.MODE_PRIVATE); + SharedPreferences.Editor editor = prefs.edit(); + editor.putInt(KMKey_LongpressDelay, longpressDelay); + editor.commit(); + } + + /** + * Sends options to the KeymanWeb keyboard. + * 1. number of milliseconds to trigger a longpress gesture. + * This method requires a keyboard to be loaded for the value to take effect. + */ + public static void sendOptionsToKeyboard() { + int longpressDelay = getLongpressDelay(); + if (isKeyboardLoaded(KeyboardType.KEYBOARD_TYPE_INAPP)) { + InAppKeyboard.loadJavascript(KMString.format("setLongpressDelay(%d)", longpressDelay)); + } + + if (SystemKeyboard != null) { + SystemKeyboard.loadJavascript(KMString.format("setLongpressDelay(%d)", longpressDelay)); + } + } + public static int getBannerHeight(Context context) { int bannerHeight = 0; if (InAppKeyboard != null && InAppKeyboard.getBanner() != BannerType.BLANK) { diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KeyboardInfoActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/KeyboardInfoActivity.java index c2daaea303..1897920b73 100644 --- a/android/KMEA/app/src/main/java/com/keyman/engine/KeyboardInfoActivity.java +++ b/android/KMEA/app/src/main/java/com/keyman/engine/KeyboardInfoActivity.java @@ -88,7 +88,7 @@ public final class KeyboardInfoActivity extends BaseActivity { hashMap = new HashMap(); final String customHelpLink = kbd.getHelpLink(); // Check if app declared FileProvider - String icon = String.valueOf(R.drawable.ic_arrow_forward); + String icon = String.valueOf(R.drawable.ic_action_forward); // Don't show help link arrow if it's a local help file and File Provider unavailable, // or custom help doesn't exist if ( (customHelpLink != null && ! KMManager.isTestMode() && diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/ModelInfoActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/ModelInfoActivity.java index ef1b180c52..ce81927699 100644 --- a/android/KMEA/app/src/main/java/com/keyman/engine/ModelInfoActivity.java +++ b/android/KMEA/app/src/main/java/com/keyman/engine/ModelInfoActivity.java @@ -81,7 +81,7 @@ public final class ModelInfoActivity extends BaseActivity { final String customHelpLink = lm.getHelpLink(); // Check if app declared FileProvider // Currently, model help only available if custom link exists - icon = String.valueOf(R.drawable.ic_arrow_forward); + icon = String.valueOf(R.drawable.ic_action_forward); // Don't show help link arrow if both custom help and File Provider don't exist // TODO: Update this when model help available on help.keyman.com if ( (!customHelpLink.equals("") && !FileProviderUtils.exists(context)) || diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java index 8b74e261a3..4595aae1e7 100644 --- a/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java +++ b/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java @@ -321,7 +321,7 @@ public final class ModelPickerActivity extends BaseActivity { // once it has its own backing Dataset instance. // Is this an installed model or not? - holder.imgDetails.setImageResource(R.drawable.ic_arrow_forward); + holder.imgDetails.setImageResource(R.drawable.ic_action_forward); if (KeyboardPickerActivity.containsLexicalModel(context, modelKey)) { holder.imgInstalled.setImageResource(R.drawable.ic_check); } else { diff --git a/android/KMEA/app/src/main/res/drawable-hdpi/ic_arrow_back.png b/android/KMEA/app/src/main/res/drawable-hdpi/ic_arrow_back.png new file mode 100644 index 0000000000..7922c65016 Binary files /dev/null and b/android/KMEA/app/src/main/res/drawable-hdpi/ic_arrow_back.png differ diff --git a/android/KMEA/app/src/main/res/drawable-mdpi/ic_arrow_back.png b/android/KMEA/app/src/main/res/drawable-mdpi/ic_arrow_back.png new file mode 100644 index 0000000000..0c1eb7a417 Binary files /dev/null and b/android/KMEA/app/src/main/res/drawable-mdpi/ic_arrow_back.png differ diff --git a/android/KMEA/app/src/main/res/drawable-xhdpi/ic_arrow_back.png b/android/KMEA/app/src/main/res/drawable-xhdpi/ic_arrow_back.png new file mode 100644 index 0000000000..e8e7047ce7 Binary files /dev/null and b/android/KMEA/app/src/main/res/drawable-xhdpi/ic_arrow_back.png differ diff --git a/android/KMEA/app/src/main/res/drawable-xxhdpi/ic_arrow_back.png b/android/KMEA/app/src/main/res/drawable-xxhdpi/ic_arrow_back.png new file mode 100644 index 0000000000..831448cb17 Binary files /dev/null and b/android/KMEA/app/src/main/res/drawable-xxhdpi/ic_arrow_back.png differ diff --git a/android/KMEA/app/src/main/res/drawable-xxxhdpi/ic_arrow_back.png b/android/KMEA/app/src/main/res/drawable-xxxhdpi/ic_arrow_back.png new file mode 100644 index 0000000000..5794fbcaac Binary files /dev/null and b/android/KMEA/app/src/main/res/drawable-xxxhdpi/ic_arrow_back.png differ diff --git a/android/KMEA/app/src/main/res/drawable/ic_action_back.xml b/android/KMEA/app/src/main/res/drawable/ic_action_back.xml new file mode 100644 index 0000000000..cae0c5eed4 --- /dev/null +++ b/android/KMEA/app/src/main/res/drawable/ic_action_back.xml @@ -0,0 +1,5 @@ + + diff --git a/android/KMAPro/kMAPro/src/main/res/drawable/ic_action_forward.xml b/android/KMEA/app/src/main/res/drawable/ic_action_forward.xml similarity index 67% rename from android/KMAPro/kMAPro/src/main/res/drawable/ic_action_forward.xml rename to android/KMEA/app/src/main/res/drawable/ic_action_forward.xml index 15efecf557..2ffd9c4540 100644 --- a/android/KMAPro/kMAPro/src/main/res/drawable/ic_action_forward.xml +++ b/android/KMEA/app/src/main/res/drawable/ic_action_forward.xml @@ -1,4 +1,5 @@ + android:tint="@android:color/black" + android:autoMirrored="true"/> diff --git a/android/KMEA/app/src/main/res/layout/help_bubble_layout.xml b/android/KMEA/app/src/main/res/layout/help_bubble_layout.xml index 953c74e692..16e2c3d47a 100644 --- a/android/KMEA/app/src/main/res/layout/help_bubble_layout.xml +++ b/android/KMEA/app/src/main/res/layout/help_bubble_layout.xml @@ -15,8 +15,8 @@ android:layout_gravity="center" android:gravity="center" android:paddingBottom="10dp" - android:paddingLeft="2dp" - android:paddingRight="2dp" + android:paddingStart="2dp" + android:paddingEnd="2dp" android:text="@string/help_bubble_text" android:textColor="#404040" android:textSize="12sp" /> diff --git a/android/KMEA/app/src/main/res/layout/models_list_row_layout.xml b/android/KMEA/app/src/main/res/layout/models_list_row_layout.xml index ac07621cdd..a2116bcb4c 100644 --- a/android/KMEA/app/src/main/res/layout/models_list_row_layout.xml +++ b/android/KMEA/app/src/main/res/layout/models_list_row_layout.xml @@ -44,7 +44,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@android:color/transparent" - android:src="@drawable/ic_arrow_forward" + android:src="@drawable/ic_action_forward" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="12dp" diff --git a/android/KMEA/app/src/main/res/values-ar-rSA/strings.xml b/android/KMEA/app/src/main/res/values-ar-rSA/strings.xml new file mode 100644 index 0000000000..cb2e9f0d51 --- /dev/null +++ b/android/KMEA/app/src/main/res/values-ar-rSA/strings.xml @@ -0,0 +1,188 @@ + + + + + + + لوحة مفاتيح + لوحات مفاتيح + لوحتا مفاتيح + لوحات مفاتيح + لوحة مفاتيح + لوحة مفاتيح + + + + طريقة إداخل أخرى + طريقة إدخال أخرى + طريقتا إدخال أخريتان + طرق إدخال + طريقة إدخال أخرى + طريقة إدخال أخرى + + + إضافة لوحة مفاتيح جديدة + + اللغات المثبتة + + إعدادات %1$s + + إضافة + + عودة + + إلغاء + + إغلاق + + إغلاق Keyman + + الأمام + + طريقة الإدخال التالية + + تحميل + + تثبيت + + لاحقًا + + التالي + + موافق + + تحديث + + لا يوجد اتصال بالإنترنت + + لا يمكن الاتصال بخادم Keyman! + + هل ترغب بإزالة لوحة المفاتيح هذه؟ + + هل ترغب بتحميل آخر إصدار من لوحة المفاتيح هذه؟ + + هل ترغب بتحديث لوحات المفاتيح والقواميس الآن؟ + + تحديثات الموارد + + تتوفر تحديثات موارد + + %1$s (تحديث متوفر) + + تحديثات متوفرة للوحة مفاتيح %1$s: %2$s + + تحديثات متوفرة لقاموس %1$s: %2$s + + إصدار لوحة المفاتيح + + رابط المساعدة + + إزالة تثبيت لوحة المفاتيح + + [new] %1$s + + امسح هذا الرمز لتحميل \nلوحة المفاتيح هذه على جهاز آخر + + أهلًا بك في %1$s + + مكتبة FileProvider مطلوبة لعرض ملفات المساعدة: %1$s + + خطأ كبير في لوحة مفاتيح مع %1$s:%2$s لأجل لغة %3$s. سيتم تحميل لوحة المفاتيح الأساسية. + + خطأ في لوحة مفاتيح %1$s:%2$s لأجل لغة %3$s. + + يجري التحقق من قاموس ذي صلة للتحميل + لا يمكن الاتصال بخادم Keyman للتحقق من تنزيل القاموس المرتبط + + هل ترغب بتحملي آخر إصدار من هذا القاموس؟ + + لا يوجد قاموس لتحميله + + كتالوغ المصدر غير متوفر + + بدء تحديث الكتالوغ في الخلفية + + الكتالوغ لا يزال يتم تحميله، يرجى المحاولة مجددًا بعد قليل! + + البحث عن مصدر + + بدء تحميل لوحة المفاتيح في الخلفية + + يجري بالفعل تحميل لوحة المفاتيح المختارة، يرجى المحاولة مجددًا بعد قليل! + + اكتمل تحميل لوحة المفاتيح! + + بدأ تحميل القاموس في الخلفية + + يجري بالفعل تحميل القاموس، يرجى المحاولة مجددًا بعد قليل! + + اكتمل تحميل القاموس. + + فشل التحميل + + فشل استرجاع الملف المحمل + + فشل الوصول إلى الخادم! + + "جميع الموارد محدّثة!" + + فشل تحديث واحد أو أكثر من المصادر! + + تم تحديث الموارد بنجاح! + + إصدار القاموس + + إزالة تثبيت القاموس + + هل ترغب بإزالة هذا القاموس؟ + + تم حذف القاموس + + تم تثبيت لوحة مفاتيح %1$s + + تم حذف لوحة المفاتيح + + تفعيل التصحيحات + + تفعيل التوقعات + + القاموس + + Dictionaries + Dictionary + Dictionaries + Dictionaries + Dictionaries + Dictionaries + + + البحث عن قاموس متوفر + تحقق من وجود قواميس على الإنترنت + + قاموس: %1$s + + قواميس %1$s + + + تم تثبيت القاموس + + + (%1$d اوحات) + (لوحة مفاتيح %1$d) + (لوحتا مفاتيح %1$d) + (%1$d لوحة مفاتيح) + (%1$d لوحة مفاتيح) + (%1$d لوحة مفاتيح) + + + اللغة الأصلية + + + + حذف + + + اضغط هنا لتغيير لوحة المفاتيح + + غير قادر على تشغيل متصفح الويب + diff --git a/android/KMEA/app/src/main/res/values-b+el/strings.xml b/android/KMEA/app/src/main/res/values-b+el/strings.xml index 871171d63f..75c774ebd1 100644 --- a/android/KMEA/app/src/main/res/values-b+el/strings.xml +++ b/android/KMEA/app/src/main/res/values-b+el/strings.xml @@ -27,7 +27,7 @@ Κλεῖστε - Κλεῖστε τὸ Κῆμαν + Κλεῖστε τὸ Keyman Προχωρῆστε @@ -53,11 +53,11 @@ Θὰ θέλατε νὰ κατεβάσετε τὴν τελευταία ἔκδοση αὐτοῦ τοῦ πληκτρολογίου; - Θά θέλατε νὰ ἐνημερώσετε τώρα πληκτρολόγια καὶ λεξικά; + Θὰ θέλατε νὰ ἐνημερώσετε τώρα πληκτρολόγια καὶ λεξικά; - Ἐνημερώσεις Πόρων + Ἐνημερώσεις - Διαθέσιμες Ἐνημερώσεις Πόρων + Διαθέσιμες Ἐνημερώσεις %1$s (Διαθέσιμη Ἐνημέρωση) @@ -67,13 +67,13 @@ Ἔκδοση πληκτρολογίου - Σύνδεσμος βοηθείας + Βοήθεια Ἀπεγκαταστῆστε πληκτρολόγιο [νέο] %1$s - Σαρῶστε αὐτὸν τὸν κωδικό γιὰ νὰ φορτώσετε\nαὐτὸ τὸ πληκτρολόγιο σὲ ἄλλη συσκευή + Σαρῶστε αὐτὸν τὸν κωδικὸ γιὰ νὰ φορτώσετε\nαὐτὸ τὸ πληκτρολόγιο σὲ ἄλλη συσκευή Καλωσορίσατε στὸ %1$s @@ -81,22 +81,22 @@ Μοιραῖο σφάλμα πληκτρολογίου στὸ %1$s:%2$s γιὰ τὴν %3$s γλῶσσα. Φορτώνεται προεπιλεγμένο πληκτρολόγιο. - Error in keyboard %1$s:%2$s for %3$s language. + Σφάλμα στὸ πληκτρολόγιο %1$s:%2$s γιὰ τὴν γλῶσσα \"%3$s\". - Ἔλεγχος συσχετισμένου λεξικοῦ πρὸς λῆψιν - Ἀδυναμία συνδέσεως μὲ τὸν διακομιστὴ Κῆμαν γιὰ τὸν ἔλεγχο συσχετισμένου λεξικοῦ πρὸς λῆψιν + Ἀναζήτηση σχετικοῦ λεξικοῦ πρὸς μεταφόρτωσιν + Ἀδυναμία συνδέσεως μὲ τὸν διακομιστὴ Keyman γιὰ τὴν εὕρεση σχετικοῦ λεξικοῦ πρὸς μεταφόρτωσιν Θὰ θέλατε νὰ κατεβάσετε τὴν τελευταία ἔκδοση αὐτοῦ τοῦ λεξικοῦ; - Δὲν ὑπάρχει λεξικὸ πρὸς λῆψιν + Δὲν ὑπάρχει λεξικὸ πρὸς μεταφόρτωσιν Μὴ διαθέσιμος κατάλογος πόρων Ἔχει ξεκινήσει ἐνημέρωση καταλόγου στὸ παρασκήνιο - Ἡ λήψη τοῦ καταλόγου συνεχίζεται· παρακαλοῦμε ξαναδοκιμάστε σὲ λίγο! + Ἡ μεταφόρτωση τοῦ καταλόγου συνεχίζεται· παρακαλοῦμε ξαναδοκιμάστε σὲ λίγο! - Ἔλεγχος πόρου σὲ ἐξέλιξη + Ἀναζήτηση πόρου σὲ ἐξέλιξη Ἡ λήψη τοῦ πληκτρολογίου ἔχει ξεκινήσει στὸ παρασκήνιο @@ -112,7 +112,7 @@ Ἡ λήψη ἀπέτυχε - Ἀποτυχία ἀνακτήσεως ληφθέντος ἀρχείου + Ἀποτυχία ἀνακλήσεως ληφθέντος ἀρχείου Ἀποτυχία προσβάσεως στὸν διακομιστή! @@ -120,11 +120,11 @@ Ἕνας ἢ περισσότεροι πόροι ἀπέτυχαν νὰ ἐνημερωθοῦν! - Οἱ πόροι ἐνημερώθηκαν ἐπιτυχῶς! + Ὅλες οἱ ἐνημερώσεις ὁλοκληρώθηκαν ἐπιτυχῶς! Ἔκδοση λεξικοῦ - Ἀπεγκαταστῆτε λεξικό + Ἀπεγκαταστῆστε λεξικό Θὰ θέλατε νὰ διαγράψετε αὐτὸ τὸ λεξικό; @@ -136,16 +136,16 @@ Ἐνεργοποιῆστε τὶς διορθώσεις - Ἐνεργοποιῆστε προβλέψεις + Ἐνεργοποιῆστε προβλέψεις κειμένου - Λεξικά + Λεξικό Λεξικό Λεξικά - Ἔλεγχος διαθεσίμου λεξικοῦ - Ἔλεγχος λεξικῶν ὀνλάϊν + Ἀναζήτηση διαθεσίμου λεξικοῦ + Ἀναζήτηση λεξικῶν ὀνλάϊν Λεξικό: %1$s diff --git a/build.sh b/build.sh new file mode 100755 index 0000000000..a455d3307f --- /dev/null +++ b/build.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env bash +## START STANDARD BUILD SCRIPT INCLUDE +# adjust relative paths as necessary +THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" +. "${THIS_SCRIPT%/*}/resources/build/builder.inc.sh" +## END STANDARD BUILD SCRIPT INCLUDE + +builder_describe "Keyman -- all projects" \ + ":common" \ + ":core" \ + ":android" \ + ":ios" \ + ":linux" \ + ":mac" \ + ":web" \ + ":windows" \ + ":developer" \ + clean \ + configure \ + build \ + test \ + install \ + publish + +builder_describe_platform \ + :android android-studio \ + :ios mac \ + :linux linux \ + :mac mac \ + :windows win + +builder_parse "$@" + +#------------------------------------------------------------------------------------------------------------------- + +builder_run_child_actions clean configure build test publish install diff --git a/common/build.sh b/common/build.sh index 2d3c2ff8c4..5119bca8ac 100755 --- a/common/build.sh +++ b/common/build.sh @@ -16,6 +16,11 @@ builder_describe "Keyman common and resources modules" \ build \ test +builder_describe_platform \ + :linux linux \ + :mac mac \ + :windows win + builder_parse "$@" #------------------------------------------------------------------------------------------------------------------- diff --git a/common/cpp/km_u16.cpp b/common/cpp/km_u16.cpp new file mode 100644 index 0000000000..84a6c4a75e --- /dev/null +++ b/common/cpp/km_u16.cpp @@ -0,0 +1,389 @@ +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * std::u16string functions and string conversion utility functions + */ + +#include +#include "utfcodec.hpp" +#include "km_u16.h" + +/** string <- wstring + * @brief Obtain a std::string from a std::wstring + * @param wstr the std::wstring to be converted + * @return a std::string + */ +std::string string_from_wstring(std::wstring const wstr) { + return convert((const std::wstring)wstr); +} + +/** wstring <- string + * @brief Obtain a std::wstring from a std::string + * @param str the std::string to be converted + * @return a std::wstring + */ +std::wstring wstring_from_string(std::string const str) { + return convert((const std::string)str); +} + +/** u16string <- string + * @brief Obtain a std::u16string from a std::string + * @param str the std::string to be converted + * @return a std::u16string + */ +std::u16string u16string_from_string(std::string const str) { + return convert((const std::string)str); +} + +/** string <- u16string + * @brief Obtain a std::string from a std::u16string + * @param str16 the std::u16string to be converted + * @return a std::string + */ +std::string string_from_u16string(std::u16string const str16) { + return convert((const std::u16string)str16); +} + +/** wstring <- u16string + * @brief Obtain a std::wstring from a std::u16string + * @param str16 the std::u16string to be converted + * @return a std::wstring + */ +std::wstring wstring_from_u16string(std::u16string const str16) { + return convert((const std::u16string)str16); +} + +/** u16string <- wstring + * @brief Obtain a std::u16string from a std::wstring + * @param wstr the std::wstring to be converted + * @return a std::u16string + */ +std::u16string u16string_from_wstring(std::wstring const wstr) { + return convert((const std::wstring)wstr); +} + +/** + * @brief Convert pointer to wchar_t to pointer to char16_t and copy sz elements into dst + * @param dst destination + * @param sz nr of characters to be copied + * @param fmt source to convert and copy + */ +void u16sprintf(KMX_WCHAR* dst, const size_t sz, const wchar_t* fmt, ...) { + wchar_t* wbuf = new wchar_t[sz]; + va_list args; + va_start(args, fmt); + vswprintf(wbuf, sz, fmt, args); + va_end(args); + + std::u16string u16str = u16string_from_wstring(wbuf); + u16ncpy(dst, u16str.c_str(), sz); + delete[] wbuf; +} + +/** + * @brief Convert u16string to long integer + * @param str u16string beginning with the representation of an integral number. + * @param endptr Reference to the next character in str + * @param base Numerical base (radix) that determines the valid characters and their interpretation + * @return a long + */ +long int u16tol(const KMX_WCHAR* str, KMX_WCHAR** endptr, int base) { + auto s = string_from_u16string(str); + char* t; + long int result = strtol(s.c_str(), &t, base); + if (endptr != nullptr) + *endptr = (KMX_WCHAR*)str + (t - s.c_str()); + return result; +} + +std::string toHex(int num1) { + if (num1 == 0) + return "0"; + int num = num1; + std::string s = ""; + while (num) { + int temp = num % 16; + if (temp <= 9) + s += (48 + temp); + else + s += (87 + temp); + num = num / 16; + } + std::reverse(s.begin(), s.end()); + return s; +} + +/** + * @brief Append max characters from u16string + * @param dst Pointer to the destination array + * @param src u16string to be appended + * @param max Maximum number of characters to be appended. + * @return Pointer to dst + */ +const KMX_WCHAR* u16ncat(KMX_WCHAR* dst, const KMX_WCHAR* src, size_t max) { + KMX_WCHAR* o = dst; + dst = (KMX_WCHAR*)u16chr(dst, 0); + // max -= (dst-o); + while (*src && max > 0) { + *dst++ = *src++; + max--; + } + if (max > 0) + *dst = 0; + return o; +} + +/** + * @brief Find last '/' or '\\' in an array of char16_t + * @param name Pointer to the source + * @return Pointer to the last slash/backslash + */ +const KMX_WCHAR* u16rchr_slash(KMX_WCHAR const* name) { + const KMX_WCHAR* cp = NULL; + cp = u16rchr(name, '\\'); + if (cp == NULL) + cp = u16rchr(name, '/'); + return cp; +} + +/** + * @brief Find last '/' or '\\' in an array of char + * @param name Pointer to the source + * @return Pointer to the last slash/backslash + */ +KMX_CHAR* strrchr_slash(KMX_CHAR* name) { + KMX_CHAR* cp = NULL; + cp = strrchr(name, '\\'); + if (cp == NULL) + cp = strrchr(name, '/'); + return cp; +} + +/** + * @brief Locate last occurrence of character in u16string + * @param p Pointer to the source + * @param ch The character to be found + * @return A pointer to the last occurrence of character in u16str + */ +const KMX_WCHAR* u16rchr(const KMX_WCHAR* p, KMX_WCHAR ch) { + const KMX_WCHAR* p_end = p + u16len(p) - 1; + + if (ch == '\0') + return p_end + 1; + while (p_end >= p) { + if (*p_end == ch) + return p_end; + p_end--; + } + return NULL; +} + +/** + * @brief Locate first occurrence of character in u16string + * @param p Pointer to the source + * @param ch The character to be found + * @return A pointer to the first occurrence of character in u16str + */ +const KMX_WCHAR* u16chr(const KMX_WCHAR* p, KMX_WCHAR ch) { + while (*p) { + if (*p == ch) + return p; + p++; + } + return ch == 0 ? p : NULL; +} + +/** + * @brief Copy the u16string pointed to by scr into the array pointed to by dst + * @param dst Pointer to the destination + * @param src Pointer to the source to be copied + * @return Pointer to dst + */ +const KMX_WCHAR* u16cpy(KMX_WCHAR* dst, const KMX_WCHAR* src) { + KMX_WCHAR* o = dst; + while (*src) { + *dst++ = *src++; + } + *dst = 0; + return o; +} + +/** + * @brief Copy max characters of the u16string pointed to by src into the array pointed by dst + * @param dst Pointer to the destination + * @param src Pointer to the source to be copied + * @param max Maximum number of characters to be copied + * @return Pointer to dst + */ +const KMX_WCHAR* u16ncpy(KMX_WCHAR* dst, const KMX_WCHAR* src, size_t max) { + KMX_WCHAR* o = dst; + while (*src && max > 0) { + *dst++ = *src++; + max--; + } + if (max > 0) { + *dst = 0; + } + return o; +} + +/** + * @brief Return the length of the u16string str + * @param p Pointer to the source + * @return The length of u16string + */ +size_t u16len(const KMX_WCHAR* p) { + int i = 0; + while (*p) { + p++; + i++; + } + return i; +} + +/** + * @brief Compare two u16strings + * @param p Pointer one u16string + * @param q Pointer another u16string + * @return 0 if strings are equal + * ! = 0 if unequal + */ +int u16cmp(const KMX_WCHAR* p, const KMX_WCHAR* q) { + while (*p && *q) { + if (*p != *q) + return *p - *q; + p++; + q++; + } + return *p - *q; +} + +/** + * @brief Case insensitive comparison of up to count characters in two strings + * @param p Pointer one u16string + * @param q Pointer another u16string + * @param count Maximum number of characters to compare + * @return 0 if strings are equal + * ! = 0 if unequal + */ +int u16nicmp(const KMX_WCHAR* p, const KMX_WCHAR* q, size_t count) { + while (*p && *q && count) { + if (toupper(*p) != toupper(*q)) + return *p - *q; + p++; + q++; + count--; + } + if (count) + return *p - *q; + return 0; +} + +/** + * @brief Case insensitive comparison of two strings + * @param p Pointer one u16string + * @param q Pointer another u16string + * @return 0 if strings are equal + * ! = 0 if unequal + */ +int u16icmp(const KMX_WCHAR* p, const KMX_WCHAR* q) { + while (*p && *q) { + if (toupper(*p) != toupper(*q)) + return *p - *q; + p++; + q++; + } + return *p - *q; +} + +/** + * @brief Comparison of up to count characters in two strings + * @param p Pointer one u16string + * @param q Pointer another u16string + * @param count Maximum number of characters to compare + * @return 0 if strings are equal + * ! = 0 if unequal + */ +int u16ncmp(const KMX_WCHAR* p, const KMX_WCHAR* q, size_t count) { + while (*p && *q && count) { + if (*p != *q) + return *p - *q; + p++; + q++; + count--; + } + if (count) + return *p - *q; + return 0; +} + +/** + * @brief Split u16string into tokens + * @param p Pointer to u16string to parse. + * @param ch the delimiter character + * @param ctx the remaining string after the first delimiter + * @return Pointer to the first token in p + */ +KMX_WCHAR* u16tok(KMX_WCHAR* p, const KMX_WCHAR ch, KMX_WCHAR** ctx) { + if (!p) { + p = *ctx; + if (!p) + return NULL; + } + + KMX_WCHAR* q = p; + while (*q && *q != ch) { + q++; + } + if (*q) { + *q = 0; + q++; + while (*q == ch) + q++; + *ctx = q; + } else { + *ctx = NULL; + } + return *p ? p : NULL; +} + +/** + * @brief Split u16string into tokens + * @param p Pointer to u16string to parse. + * @param delimiters an array of delimiter characters + * @param ctx the remaining string after the first delimiter + * @return Pointer to the first token in p + */ +KMX_WCHAR* u16tok(KMX_WCHAR* p, const KMX_WCHAR* delimiters, KMX_WCHAR** ctx) { + if (!p) { + p = *ctx; + if (!p) + return NULL; + } + + KMX_WCHAR* q = p; + while (*q && !u16chr(delimiters, *q)) { + q++; + } + if (*q) { + *q = 0; + q++; + while (*q && u16chr(delimiters, *q)) + q++; + *ctx = q; + } else { + *ctx = NULL; + } + return *p ? p : NULL; +} + +/** + * @brief Convert a u16string to a double + * @param str Pointer to u16string + * @return double value equivalent to the string + */ +double u16tof(KMX_WCHAR* str16) { + char* pEnd; + std::string str = string_from_u16string(str16); + return strtof(str.c_str(), &pEnd); +} diff --git a/core/src/utfcodec.cpp b/common/cpp/utfcodec.cpp similarity index 100% rename from core/src/utfcodec.cpp rename to common/cpp/utfcodec.cpp diff --git a/common/include/km_u16.h b/common/include/km_u16.h new file mode 100644 index 0000000000..f0c2c2d16c --- /dev/null +++ b/common/include/km_u16.h @@ -0,0 +1,76 @@ +#pragma once + +#include +#include +#include + +/** @brief Obtain a std::string from a std::wstring */ +std::string string_from_wstring(std::wstring const wstr); + +/** @brief Obtain a std::wstring from a std::string */ +std::wstring wstring_from_string(std::string const str); + +/** @brief Obtain a std::u16string from a std::string */ +std::u16string u16string_from_string(std::string const str); + +/** @brief Obtain a std::string from a std::u16string */ +std::string string_from_u16string(std::u16string const str16); + +/** @brief Obtain a std::wstring from a std::u16string */ +std::wstring wstring_from_u16string(std::u16string const str16); + +/** @brief Obtain a std::u16string from a std::wstring */ +std::u16string u16string_from_wstring(std::wstring const wstr); + +/** @brief Convert pointer to wchar_t to pointer to char16_t and copy sz elements into dst */ +void u16sprintf(KMX_WCHAR* dst, const size_t sz, const wchar_t* fmt, ...); + +/** @brief Return the length of the u16string str */ +size_t u16len(const KMX_WCHAR* p); + +/** @brief Compare two u16strings */ +int u16cmp(const KMX_WCHAR* p, const KMX_WCHAR* q); + +/** @brief Case insensitive comparison of two strings */ +int u16icmp(const KMX_WCHAR* p, const KMX_WCHAR* q); + +/** @brief Comparison of up to count characters in two strings */ +int u16ncmp(const KMX_WCHAR* p, const KMX_WCHAR* q, size_t count); + +/** @brief Case insensitive comparison of up to count characters in two strings */ +int u16nicmp(const KMX_WCHAR* p, const KMX_WCHAR* q, size_t count); + +/** @brief Copy max characters of the u16string pointed to by src into the array pointed to by dst */ +const KMX_WCHAR* u16ncpy(KMX_WCHAR* dst, const KMX_WCHAR* src, size_t max); + +/** @brief Copy the u16string pointed to by src into the array pointed to by dst */ +const KMX_WCHAR* u16cpy(KMX_WCHAR* dst, const KMX_WCHAR* src); + +/** @brief Locate last occurrence of character in u16string */ +const KMX_WCHAR* u16rchr(const KMX_WCHAR* p, KMX_WCHAR ch); + +/** @brief Locate first occurrence of character in u16string */ +const KMX_WCHAR* u16chr(const KMX_WCHAR* p, KMX_WCHAR ch); + +/** @brief Append max characters from u16string */ +const KMX_WCHAR* u16ncat(KMX_WCHAR* dst, const KMX_WCHAR* src, size_t max); + +/** @brief Split u16string into tokens */ +KMX_WCHAR* u16tok(KMX_WCHAR* p, const KMX_WCHAR ch, KMX_WCHAR** ctx); + +/** @brief Split u16string into tokens */ +KMX_WCHAR* u16tok(KMX_WCHAR* p, const KMX_WCHAR* delimiters, KMX_WCHAR** ctx); + +/** @brief Convert a u16string to a double */ +long int u16tol(const KMX_WCHAR* str, KMX_WCHAR** endptr, int base); + +/** @brief Convert a u16string to a double */ +double u16tof(KMX_WCHAR* str); + +/** @brief find last '/' or '\\' in an array of char */ +KMX_CHAR* strrchr_slash(KMX_CHAR* Name); + +/** @brief find last '/' or '\\' in an array of char16_t */ +const KMX_WCHAR* u16rchr_slash(KMX_WCHAR const* Name); + +std::string toHex(int num1); diff --git a/core/src/utfcodec.hpp b/common/include/utfcodec.hpp similarity index 100% rename from core/src/utfcodec.hpp rename to common/include/utfcodec.hpp diff --git a/common/models/templates/src/index.ts b/common/models/templates/src/index.ts index 8563004fef..0966fb4494 100644 --- a/common/models/templates/src/index.ts +++ b/common/models/templates/src/index.ts @@ -3,5 +3,5 @@ export { transformToSuggestion, defaultApplyCasing } from "./common.js"; export { default as QuoteBehavior } from "./quote-behavior.js"; -export { Tokenization, tokenize, getLastPreCaretToken, wordbreak } from "./tokenization.js"; +export { getLastPreCaretToken, Token, Tokenization, tokenize, wordbreak } from "./tokenization.js"; export { default as TrieModel, TrieModelOptions } from "./trie-model.js"; \ No newline at end of file diff --git a/common/models/templates/src/tokenization.ts b/common/models/templates/src/tokenization.ts index 2aa5c392e6..2fb07da357 100644 --- a/common/models/templates/src/tokenization.ts +++ b/common/models/templates/src/tokenization.ts @@ -1,18 +1,23 @@ // While we _could_ define this within @keymanapp/models-wordbreakers instead, it's probably // better to leave that package as _just_ the wordbreakers. +export interface Token { + text: string, + isWhitespace?: boolean +} + export interface Tokenization { /** * An array of tokens to the left of the caret. If the caret is in the middle of a token, * only the part to the left of the caret is included. */ - left: USVString[], + left: Token[], /** * An array of tokens to the right of the caret. If the caret is in the middle of a token, * only the part to the right of the caret is included. */ - right: USVString[], + right: Token[], /** * A flag indicating whether or not the caret's position in the context caused a token @@ -22,21 +27,74 @@ export interface Tokenization { caretSplitsToken: boolean } -export function tokenize(wordBreaker: WordBreakingFunction, context?: Partial): Tokenization { +export function tokenize( + wordBreaker: WordBreakingFunction, + context: Partial, + options?: { + /** Characters to rejoin to preceding tokens if found immediately pre-caret. */ + rejoins?: string[] + } +): Tokenization { + // The Unicode word-breaker algorithm looks for places where it's "safe" to + // split a word across lines, operating upon _completed_ words. There are + // some cases where, if placed mid-word, it would add a boundary that does not + // exist at the end of the word. The single-quote character is one such + // location - it's hard to tell if `can'` is the end of a quote or the prefix + // to `can't`. So, if `'` is immediately pre-caret, we "rejoin" it. + const rejoins = options?.rejoins || ["'"]; context = context || { left: undefined, startOfBuffer: undefined, endOfBuffer: undefined }; - let leftSpans = wordBreaker(context.left || '') || []; - let rightSpans = wordBreaker(context.right || '') || []; + const leftSpans = wordBreaker(context.left || '') || []; + const rightSpans = wordBreaker(context.right || '') || []; - let leftTail: Span; - if(leftSpans.length > 0) { - leftTail = leftSpans[leftSpans.length - 1]; + const tokenization: Tokenization = { + left: [], + right: [], + caretSplitsToken: false } + // New step 1: process left-context. + let currentIndex = 0; + while(leftSpans.length > 0) { + const nextSpan = leftSpans[0]; + if(Math.max(nextSpan.start, currentIndex) != currentIndex) { + const nextIndex = Math.max(currentIndex, nextSpan.start); + // Implicit whitespace span! + tokenization.left.push({ + text: context.left!.substring(currentIndex, nextIndex), + isWhitespace: true + }); + currentIndex = nextIndex; + } else { + leftSpans.shift(); + // Explicit non-whitespace span. + tokenization.left.push({ + text: nextSpan.text + }); + currentIndex = Math.max(currentIndex, nextSpan.end); + } + } + + // Detect any pre-caret whitespace after the final pre-caret non-whitespace + // token + // + // Note: the default wordbreaker won't need this code, as it emits a `''` + // after final whitespace. + if(context.left != null && currentIndex != context.left.length) { + const nextIndex = Math.max(currentIndex, context.left!.length); + tokenization.left.push({ + text: context.left.substring(currentIndex, nextIndex), + isWhitespace: true + }); + currentIndex = nextIndex; + } + + // New step 2: handle any rejoins needed. + // Handle any desired special handling for directly-pre-caret scenarios - where for this // _specific_ context, we should not make a token division where one normally would exist otherwise. // @@ -45,62 +103,88 @@ export function tokenize(wordBreaker: WordBreakingFunction, context?: Partial 1) { - const leftTailBase = leftSpans[leftSpans.length - 2]; + let leftTokenCount = tokenization.left.length; + if(leftTokenCount > 1) { + const leftTailBase = tokenization.left[leftTokenCount - 2]; + const leftTail = tokenization.left[leftTokenCount - 1]; // If the final two pre-caret spans are adjacent - without intervening whitespace... - if(leftTailBase.end == leftTail!.start) { + if(!leftTailBase.isWhitespace && !leftTail.isWhitespace) { // Ideal: if(leftTailBase is standard-char-class && leftTail is single-quote-class) // But we don't have character class access here; it's all wordbreaker-function internal. // Upon inspection of the wordbreaker data definitions... the single-quote-class is ONLY "'". // So... we'll just be lazy for now and append the `'`. - if(leftTail!.text == "'") { - let mergedSpan: Span = { - text: leftTailBase.text + leftTail!.text, - start: leftTailBase.start, - end: leftTail!.end, - length: leftTailBase.length + leftTail!.length - }; - - leftSpans.pop(); // leftTail - leftSpans.pop(); // leftTailBase - leftSpans.push(mergedSpan); - leftTail = mergedSpan; // don't forget to update the `leftTail` Span! + if(rejoins.indexOf(leftTail!.text) != -1) { + tokenization.left.pop(); // leftTail + tokenization.left.pop(); // leftTailBase + tokenization.left.push({ + text: leftTailBase.text + leftTail.text + }); + leftTokenCount--; } } } - // With any 'detokenization' cases already handled, we may now begin to build the return object. - let tokenization: Tokenization = { - left: leftSpans.map(span => span.text), - right: rightSpans.map(span => span.text), + // New step 3: right-context tokenization + token split detection - // A default initialization of the value. - caretSplitsToken: false - }; + // context.right starts from index 0; it's an 'index reset'. + currentIndex = 0; + // Set a flag for special "first token" processing. + let firstRightToken = true; - // Now the hard part - determining whether or not the caret caused a token split. - if(leftSpans.length > 0 && rightSpans.length > 0) { - let rightHead = rightSpans[0]; + // Note: is MOSTLY "WET" with the left-span loop, though the + // `caretSplitsToken` check is additional. + while(rightSpans.length > 0) { + const nextSpan = rightSpans[0]; + if(Math.max(nextSpan.start, currentIndex) != currentIndex) { + const nextIndex = Math.max(currentIndex, nextSpan.start); + // Implicit whitespace span! + tokenization.right.push({ + text: context.right!.substring(currentIndex, nextIndex), + isWhitespace: true + }); + currentIndex = nextIndex; + } else { + const leftTail = tokenization.left[leftTokenCount-1]; + if(leftTail) { + // If the first non-whitespace token to the right is non-whitespace, + // and the last token to the left is non-whitespace, the caret may + // be splitting a token. + if(firstRightToken && !leftTail.isWhitespace) { + if(wordBreaker(leftTail!.text + nextSpan.text).length == 1) { + tokenization.caretSplitsToken = true; + } + } + } - // If tokenization includes all characters on each side of the caret, - // we have a good candidate for a caret-splitting scenario. - let leftSuffixWordbreak = leftTail!.end != context.left!.length; - let rightPrefixWordbreak = rightHead.start != 0; - - if(leftSuffixWordbreak || rightPrefixWordbreak) { - // Bypass the final test, as we already know the caret didn't split a token. - // (The tokenization process already removed characters between the two.) - return tokenization; + // Explicit non-whitespace span. + rightSpans.shift(); + tokenization.right.push({ + text: nextSpan.text + }); + currentIndex = Math.max(currentIndex, nextSpan.end); } - // Worth note - some languages don't use wordbreaking characters. So, a final check: - // - // Does the wordbreaker split a merge of the 'two center' tokens? - // If not, then the caret is responsible for the split. - if(wordBreaker(leftTail!.text + rightHead.text).length == 1) { - tokenization.caretSplitsToken = true; - } + // We've always processed the "first right token" after the first iteration. + // Do not run the caret-split check on any future iterations. + firstRightToken = false; + } + + // Detect any pre-caret whitespace after the final pre-caret non-whitespace + // token + // + // Note: the default wordbreaker won't need this code, as it emits a `''` + // after final whitespace. + // + // Also note: is pretty much WET with the similar check after the + // leftSpan loop. + if(context.right && currentIndex != context.right.length) { + const nextIndex = Math.max(currentIndex, context.right!.length); + tokenization.right.push({ + text: context.right.substring(currentIndex, nextIndex), + isWhitespace: true + }); + currentIndex = nextIndex; } return tokenization; @@ -108,12 +192,18 @@ export function tokenize(wordBreaker: WordBreakingFunction, context?: Partial 0) { - return tokenization.left.pop() as string; + const lastToken = tokenization.left.pop(); + if(lastToken!.isWhitespace) { + return ''; + } else { + return lastToken!.text; + } } return ''; diff --git a/common/models/templates/src/trie-model.ts b/common/models/templates/src/trie-model.ts index 9de2fb9050..bfe41c7aba 100644 --- a/common/models/templates/src/trie-model.ts +++ b/common/models/templates/src/trie-model.ts @@ -98,13 +98,9 @@ class Traversal implements LexiconTraversal { } child(char: USVString): LexiconTraversal | undefined { - /* - Note: would otherwise return the current instance if `char == ''`. If - such a call is happening, it's probably indicative of an implementation - issue elsewhere - let's signal now in order to catch such stuff early. - */ + // May result for blank tokens resulting immediately after whitespace. if(char == '') { - return undefined; + return this; } // Split into individual code units. diff --git a/common/models/templates/test/custom-breakers.def.js b/common/models/templates/test/custom-breakers.def.js new file mode 100644 index 0000000000..c907467ce0 --- /dev/null +++ b/common/models/templates/test/custom-breakers.def.js @@ -0,0 +1,128 @@ +/** + * The custom wordbreaker used by the sil.km.gcc model as of + * https://github.com/keymanapp/lexical-models/pull/265. + * @type {WordBreakingFunction} + * */ +export function customWordBreakerProper(str) { + const whitespaceRegex = /\s|\u200b|\n|\r/; + const tokens = str.split(whitespaceRegex); + + for(let i=0; i < tokens.length; i++) { + const token = tokens[i]; + if(token.length == 0) { + tokens.splice(i, 1); + i--; + continue; + } else if(token.length == 1 && whitespaceRegex.test(token)) { + tokens.splice(i, 1); + i--; + continue; + } + + // Certain punctuation marks should be considered a separate token from the word they're next to. + const punctuationMarks = ['«', '»', '$', '#' /* add extras here */]; + const punctSplitIndices = []; + + // Find if and where each mark exists within the token + for(let i = 0; i < punctuationMarks.length; i++) { + const split = token.indexOf(punctuationMarks[i]); + if(split >= 0) { + punctSplitIndices.push(split); + } + } + + // Sort and pick the earliest mark's location. If none exists, use -1. + punctSplitIndices.sort(); + const splitPoint = punctSplitIndices[0] === undefined ? -1 : punctSplitIndices[0]; + + if(splitPoint > -1) { + const left = token.substring(0, splitPoint); // (0, -1) => '' + const punct = token.substring(splitPoint, splitPoint+1); + const right = token.substring(splitPoint+1); // Starting past the end of the string => '' + + if(left) { + tokens.splice(i++, 0, left); + } + tokens.splice(i++, 1, punct); + if(right) { + tokens.splice(i, 0, right); + } + // Ensure that the next iteration puts `i` immediately after the punctuation token... even if + // there was a `right` portion, as it may have extra marks that also need to be spun off. + i--; + } + } + + let latestIndex = 0; + return tokens.map(function(token) { + const start = str.indexOf(token, latestIndex); + latestIndex = start + token.length; + return { + left: start, + start: start, + right: start + token.length, + end: start + token.length, + length: token.length, + text: token + } + }); +} + +/** + * The version of the custom wordbreaker used by the sil.km.gcc model + * before https://github.com/keymanapp/lexical-models/pull/265, which + * triggered #12200. + * @type {WordBreakingFunction} + * */ +export function customWordBreakerFormer (str) { + const tokens = str.split(/\s|\u200b/); + + for(let i=0; i < tokens.length; i++) { + const token = tokens[i]; + if(token.length == 1) { + continue; + } + + // Certain punctuation marks should be considered a separate token from the word they're next to. + const punctuationMarks = ['«', '»', '$', '#' /* add extras here */]; + const punctSplitIndices = []; + + // Find if and where each mark exists within the token + for(let i = 0; i < punctuationMarks.length; i++) { + const split = token.indexOf(punctuationMarks[i]); + if(split >= 0) { + punctSplitIndices.push(split); + } + } + + // Sort and pick the earliest mark's location. If none exists, use -1. + punctSplitIndices.sort(); + const splitPoint = punctSplitIndices[0] === undefined ? -1 : punctSplitIndices[0]; + + if(splitPoint > -1) { + const left = token.substring(0, splitPoint); // (0, -1) => '' + const punct = token.substring(splitPoint, splitPoint+1); + const right = token.substring(splitPoint+1); // Starting past the end of the string => '' + + if(left) { + tokens.splice(i++, 0, left); + } + tokens.splice(i++, 1, punct); + if(right) { + tokens.splice(i, 0, right); + } + // Ensure that the next iteration puts `i` immediately after the punctuation token... even if + // there was a `right` portion, as it may have extra marks that also need to be spun off. + i--; + } + } + return tokens.map(function(token) { + return { + left: str.indexOf(token), + start: str.indexOf(token), + right: str.indexOf(token) + token.length, + end: str.indexOf(token) + token.length, + text: token + } + }); +} \ No newline at end of file diff --git a/common/models/templates/test/test-tokenization.js b/common/models/templates/test/test-tokenization.js index 6c1ff746e5..d8f27197a2 100644 --- a/common/models/templates/test/test-tokenization.js +++ b/common/models/templates/test/test-tokenization.js @@ -5,6 +5,29 @@ import { assert } from 'chai'; import * as models from "@keymanapp/models-templates"; import * as wordBreakers from "@keymanapp/models-wordbreakers"; +import { customWordBreakerFormer, customWordBreakerProper } from './custom-breakers.def.js'; + +function asProcessedToken(text) { + // default wordbreaker emits these at the end of each context half if ending with whitespace. + // Indicates a new spot for non-whitespace text. + if(text == '') { + return { + text: text + }; + } else if(text.trim() == '') { + // Simple cases using standard Latin-script patterns - can be handled via trim() + return { + text: text, + isWhitespace: true + }; + } + + // could add simple check for other, non-default cases here. + + return { + text: text + }; +} describe('Tokenization functions', function() { describe('tokenize', function() { @@ -19,8 +42,8 @@ describe('Tokenization functions', function() { let tokenization = models.tokenize(wordBreakers.default, context); let expectedResult = { - left: ['The', 'quick', 'brown', 'fox'], - right: ['jumped', 'over', 'the', 'lazy', 'dog'], + left: ['The', ' ', 'quick', ' ', 'brown', ' ', 'fox'].map(asProcessedToken), + right: [' ', 'jumped', ' ', 'over', ' ', 'the', ' ', 'lazy', ' ', 'dog'].map(asProcessedToken), caretSplitsToken: false }; @@ -30,7 +53,7 @@ describe('Tokenization functions', function() { it('tokenizes English using defaults, pre-whitespace caret, partial context', function() { let context = { left: "quick brown fox", // No "The" - right: " jumped over the lazy", // No "dog" + right: " jumped over the lazy ", // No "dog" startOfBuffer: false, endOfBuffer: false }; @@ -38,8 +61,8 @@ describe('Tokenization functions', function() { let tokenization = models.tokenize(wordBreakers.default, context); let expectedResult = { - left: ['quick', 'brown', 'fox'], - right: ['jumped', 'over', 'the', 'lazy'], + left: ['quick', ' ', 'brown', ' ', 'fox'].map(asProcessedToken), + right: [' ', 'jumped', ' ', 'over', ' ', 'the', ' ', 'lazy', ' ', ''].map(asProcessedToken), caretSplitsToken: false }; @@ -59,14 +82,35 @@ describe('Tokenization functions', function() { // Technically, we're editing the start of the first token on the right // when in this context. let expectedResult = { - left: ['The', 'quick', 'brown', 'fox', ''], - right: ['jumped', 'over', 'the', 'lazy', 'dog'], + left: ['The', ' ', 'quick', ' ', 'brown', ' ', 'fox', ' ', ''].map(asProcessedToken), + right: ['jumped', ' ', 'over', ' ', 'the', ' ', 'lazy', ' ', 'dog'].map(asProcessedToken), caretSplitsToken: true }; assert.deepEqual(tokenization, expectedResult); }); + it('tokenizes English using ascii-breaker, post-whitespace caret', function() { + let context = { + left: "The quick brown fox ", + right: "jumped over the lazy dog ", + startOfBuffer: true, + endOfBuffer: true + }; + + let tokenization = models.tokenize(wordBreakers.ascii, context); + + // Technically, we're editing the start of the first token on the right + // when in this context. + let expectedResult = { + left: ['The', ' ', 'quick', ' ', 'brown', ' ', 'fox', ' '].map(asProcessedToken), + right: ['jumped', ' ', 'over', ' ', 'the', ' ', 'lazy', ' ', 'dog', ' '].map(asProcessedToken), + caretSplitsToken: false + }; + + assert.deepEqual(tokenization, expectedResult); + }); + it('tokenizes English using defaults, post-whitespace caret, partial context', function() { let context = { left: "quick brown fox ", @@ -80,8 +124,8 @@ describe('Tokenization functions', function() { // Technically, we're editing the start of the first token on the right // when in this context. let expectedResult = { - left: ['quick', 'brown', 'fox', ''], - right: ['jumped', 'over', 'the', 'lazy'], + left: ['quick', ' ', 'brown', ' ', 'fox', ' ', ''].map(asProcessedToken), + right: ['jumped', ' ', 'over', ' ', 'the', ' ', 'lazy'].map(asProcessedToken), caretSplitsToken: true }; @@ -99,8 +143,8 @@ describe('Tokenization functions', function() { let tokenization = models.tokenize(wordBreakers.default, context); let expectedResult = { - left: ['The', 'quick', 'brown', 'fox', 'jum'], - right: ['ped', 'over', 'the', 'lazy', 'dog'], + left: ['The', ' ', 'quick', ' ', 'brown', ' ', 'fox', ' ', 'jum'].map(asProcessedToken), + right: ['ped', ' ', 'over', ' ', 'the', ' ', 'lazy', ' ', 'dog'].map(asProcessedToken), caretSplitsToken: true }; @@ -118,15 +162,15 @@ describe('Tokenization functions', function() { let tokenization = models.tokenize(wordBreakers.default, context); let expectedResult = { - left: ['The', 'quick', 'brown', 'fox', 'jum'], - right: ['ped', 'over', 'the', 'lazy', 'dog'], + left: ['The', ' ', 'quick', ' ', 'brown', ' ', 'fox', ' ', 'jum'].map(asProcessedToken), + right: ['ped', ' ', 'over', ' ', 'the', ' ', 'lazy', ' ', 'dog'].map(asProcessedToken), caretSplitsToken: true }; assert.deepEqual(tokenization, expectedResult); }); - it('empty context case', function() { + it('properly handles empty-context cases', function() { // Wordbreaking on a empty space => no word. let context = { left: '', startOfBuffer: true, @@ -144,7 +188,7 @@ describe('Tokenization functions', function() { assert.deepEqual(tokenization, expectedResult); }); - it('nil context case', function() { + it('properly handles null context cases', function() { // Wordbreaking on a empty space => no word. let tokenization = models.tokenize(wordBreakers.default, null); @@ -157,7 +201,7 @@ describe('Tokenization functions', function() { assert.deepEqual(tokenization, expectedResult); }); - it('near-empty context: one space before caret', function() { + it('properly handles a near-empty context: one space before caret', function() { // Wordbreaking on a empty space => no word. let context = { left: ' ', startOfBuffer: true, @@ -167,7 +211,7 @@ describe('Tokenization functions', function() { let tokenization = models.tokenize(wordBreakers.default, context); let expectedResult = { - left: [''], + left: [' ', ''].map(asProcessedToken), right: [], caretSplitsToken: false }; @@ -175,6 +219,85 @@ describe('Tokenization functions', function() { assert.deepEqual(tokenization, expectedResult); }); + it('properly tokenizes partial English contractions - default setting', function() { + let context = { + left: "I can'", + right: "", + startOfBuffer: true, + endOfBuffer: true + }; + + let tokenization = models.tokenize(wordBreakers.default, context); + + // Technically, we're editing the start of the first token on the right + // when in this context. + let expectedResult = { + left: ['I', ' ', 'can\''].map(asProcessedToken), + right: [].map(asProcessedToken), + caretSplitsToken: false + }; + + assert.deepEqual(tokenization, expectedResult); + }); + + it('overly tokenizes partial English contractions when (default) apostrophe rejoin is disabled', function() { + let context = { + left: "I can'", + right: "", + startOfBuffer: true, + endOfBuffer: true + }; + + let tokenization = models.tokenize(wordBreakers.default, context, { rejoins: [] }); + + // Technically, we're editing the start of the first token on the right + // when in this context. + let expectedResult = { + left: ['I', ' ', 'can' , '\''].map(asProcessedToken), + right: [].map(asProcessedToken), + caretSplitsToken: false + }; + + assert.deepEqual(tokenization, expectedResult); + }); + + it('properly tokenizes English contractions', function() { + // Note: a 'context0' with the caret before the `'` actually + // is not supported well yet; a leading `'` is broken from + // following text when in isolation. + + let context1 = { + left: "I can'", + right: "t", + startOfBuffer: true, + endOfBuffer: true + }; + + let context2 = { + left: "I can't", + right: "", + startOfBuffer: true, + endOfBuffer: true + } + + let tokenization1 = models.tokenize(wordBreakers.default, context1); + let tokenization2 = models.tokenize(wordBreakers.default, context2); + + let expectedResult1 = { + left: ['I', ' ', 'can\''].map(asProcessedToken), + right: ['t'].map(asProcessedToken), + caretSplitsToken: true + }; + let expectedResult2 = { + left: ['I', ' ', 'can\'t'].map(asProcessedToken), + right: [].map(asProcessedToken), + caretSplitsToken: false + }; + + assert.deepEqual(tokenization1, expectedResult1); + assert.deepEqual(tokenization2, expectedResult2); + }); + // For the next few tests: a mocked wordbreaker for Khmer, a language // without whitespace between words. let mockedKhmerBreaker = function(text) { @@ -258,8 +381,8 @@ describe('Tokenization functions', function() { let tokenization = models.tokenize(mockedKhmerBreaker, context); let expectedResult = { - left: ['ស្រុក'], - right: ['ខ្មែរ'], + left: ['ស្រុក'].map(asProcessedToken), + right: ['ខ្មែរ'].map(asProcessedToken), caretSplitsToken: false }; @@ -282,8 +405,8 @@ describe('Tokenization functions', function() { let tokenization = models.tokenize(mockedKhmerBreaker, context); let expectedResult = { - left: ['ស្រុ'], - right: ['ក', 'ខ្មែរ'], + left: ['ស្រុ'].map(asProcessedToken), + right: ['ក', 'ខ្មែរ'].map(asProcessedToken), caretSplitsToken: true }; @@ -315,7 +438,7 @@ describe('Tokenization functions', function() { return wordBreakers.default(text, customization); } - it('treats caret as `eot` for pre-caret text', function() { + it('treats caret as `eot` for pre-caret text tokenization', function() { let context = { left: "don-", // We use a hyphen here b/c single-quote is hardcoded. right: " worry", @@ -326,21 +449,21 @@ describe('Tokenization functions', function() { let tokenization = models.tokenize(wordBreakers.default, context); assert.deepEqual(tokenization, { - left: ["don", "-"], - right: ["worry"], + left: ["don", "-"].map(asProcessedToken), + right: [" ", "worry"].map(asProcessedToken), caretSplitsToken: false }); tokenization = models.tokenize(midLetterNonbreaker, context); assert.deepEqual(tokenization, { - left: ["don-"], - right: ["worry"], + left: ["don-"].map(asProcessedToken), + right: [" ", "worry"].map(asProcessedToken), caretSplitsToken: false }); }); - it('handles mid-contraction tokenization', function() { + it('handles mid-contraction tokenization (via wordbreaker customization)', function() { let context = { left: "don:", right: "t worry", @@ -351,24 +474,108 @@ describe('Tokenization functions', function() { let tokenization = models.tokenize(wordBreakers.default, context); assert.deepEqual(tokenization, { - left: ["don", ":"], // This particular case feels like a possible issue. - right: ["t", "worry"], // It'd be a three-way split token, as "don:t" would - // be a single token were it not for the caret in the middle. + // This particular case feels like a possible issue. + // It'd be a three-way split token, as "don:t" would + // be a single token were it not for the caret in the middle. + left: ["don", ":"].map(asProcessedToken), + right: ["t", " ", "worry"].map(asProcessedToken), + caretSplitsToken: false }) tokenization = models.tokenize(midLetterNonbreaker, context); assert.deepEqual(tokenization, { - left: ["don:"], - right: ["t", "worry"], + left: ["don:"].map(asProcessedToken), + right: ["t", " ", "worry"].map(asProcessedToken), caretSplitsToken: true }); }); + + it('mitigates effects of previously-distributed malformed wordbreaker output', function () { + const text = 'the quick brown fox jumped over the lazy dog '; + /** @type { Context } */ + const context = { + left: text, + right: '', + startOfBuffer: true, + endOfBuffer: true + } + + const tokenized = models.tokenize(customWordBreakerFormer, context); + + // Mitigation aims to prevent the _worst_ side-effects that can result from invalidating the + // underlying assumption of a monotonically-increasing index within the context - + // assigning repeated or blank entries the text that preceded them! + assert.notExists(tokenized.left.find((token) => token.text == text)); + assert.notExists(tokenized.left.find((token) => token.text.startsWith(text.substring(0, 25)))); + + // 'the' appears twice in the context, which should result in two separate 'the' tokens here. + // This was improperly handled when we didn't check that assumption. + assert.equal(tokenized.left.filter((token) => token.text == 'the').length, 2); + + // Does not address multiple blank-token ('') entries that result from intervening spaces; + // that would add too much extra complexity to the method... and it can already be + // handled decently by the predictive-text engine. + assert.deepEqual( + tokenized.left + .filter((entry) => !entry.isWhitespace) + .filter((entry) => entry.text != '') + .map((entry) => entry.text), + ['the', 'quick', 'brown', 'fox', 'jumped', 'over', 'the', 'lazy', 'dog'] + ); + }); + + it('properly works with well-formed custom wordbreaker output', function () { + const text = 'the quick brown fox jumped over the lazy dog '; + /** @type { Context } */ + const context = { + left: text, + right: '', + startOfBuffer: true, + endOfBuffer: true + } + + const tokenized = models.tokenize(customWordBreakerProper, context); + + // Easier-to-parse version + assert.deepEqual( + tokenized.left + .filter((entry) => !entry.isWhitespace) + .map((entry) => entry.text), + ['the', 'quick', 'brown', 'fox', 'jumped', 'over', 'the', 'lazy', 'dog'] + ); + + // This time, with whitespaces. + assert.deepEqual( + tokenized.left.map((entry) => entry.text), [ + 'the', + ' ', + 'quick', + ' ', + 'brown', + ' ', + 'fox', + ' ', + 'jumped', + ' ', + 'over', + ' ', + 'the', + ' ', + 'lazy', + ' ', + 'dog', + ' ' + ] + ); + }); + + // }); describe('getLastPreCaretToken', function() { - it('with pre-whitespace caret', function() { + it('operates properly with pre-whitespace caret', function() { let context = { left: "The quick brown fox", right: " jumped over the lazy dog", @@ -381,7 +588,7 @@ describe('Tokenization functions', function() { assert.equal(tokenization, 'fox'); }); - it('with post-whitespace caret', function() { + it('operates properly with post-whitespace caret', function() { let context = { left: "The quick brown fox ", right: "jumped over the lazy dog", @@ -394,7 +601,21 @@ describe('Tokenization functions', function() { assert.equal(tokenization, ''); }); - it('within a token', function() { + + it('operates properly with post-whitespace caret, ascii breaker', function() { + let context = { + left: "The quick brown fox ", + right: "jumped over the lazy dog", + startOfBuffer: true, + endOfBuffer: true + }; + + let tokenization = models.getLastPreCaretToken(wordBreakers.ascii, context); + + assert.equal(tokenization, ''); + }); + + it('operates properly within a token', function() { let context = { left: "The quick brown fox jum", right: "ped over the lazy dog", @@ -406,10 +627,15 @@ describe('Tokenization functions', function() { assert.equal(tokenization, 'jum'); }); + + it('operates properly with no context', function() { + let tokenization = models.getLastPreCaretToken(wordBreakers.default, null); + assert.equal(tokenization, ''); + }); }); describe('wordbreak', function() { - it('with pre-whitespace caret', function() { + it('operates properly with pre-whitespace caret', function() { let context = { left: "The quick brown fox", right: " jumped over the lazy dog", @@ -422,7 +648,7 @@ describe('Tokenization functions', function() { assert.equal(tokenization, 'fox'); }); - it('with post-whitespace caret', function() { + it('operates properly with post-whitespace caret', function() { let context = { left: "The quick brown fox ", right: "jumped over the lazy dog", @@ -437,7 +663,7 @@ describe('Tokenization functions', function() { // This version is subject to change. In the future, we may wish the wordbreak // operation to include "the rest of the word" - the post-caret part. - it('within a token', function() { + it('operates properly within a token', function() { let context = { left: "The quick brown fox jum", right: "ped over the lazy dog", diff --git a/common/predictive-text/.build-builder b/common/predictive-text/.build-builder deleted file mode 100644 index 4e15741a62..0000000000 --- a/common/predictive-text/.build-builder +++ /dev/null @@ -1 +0,0 @@ -The presence of this file tells CI to use the new builder_ style parameters for build.sh and unit_tests/test.sh. \ No newline at end of file diff --git a/common/web/build.sh b/common/web/build.sh index 554b1e8ebb..fbc015613f 100755 --- a/common/web/build.sh +++ b/common/web/build.sh @@ -10,7 +10,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" # # TODO: future modules may include -# :lm-message-types \ # :sentry-manager \ # diff --git a/common/web/input-processor/README.md b/common/web/input-processor/README.md deleted file mode 100644 index 70417353a2..0000000000 --- a/common/web/input-processor/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# Keyman: Keyboard Processor Module -The Original Code is (C) 2017-2020 SIL International - -The Keyboard Processor module is an internal component of KeymanWeb, seen within this repo at /web/. - -## Minimum Compilation Requirements - -* A local installation of [Node.js](https://nodejs.org/) v8.9+. - * Builds will call `npm install` to automatically install further necessary build dependencies. - - * Linux users can update to LTS version of nodejs by following instructions on the [NodeSource Distributions](https://github.com/nodesource/distributions#table-of-contents) page. - -********************************************************************** - -The build script may be found at src/build.sh. diff --git a/common/web/input-processor/build.sh b/common/web/input-processor/build.sh deleted file mode 100755 index 45d5277db4..0000000000 --- a/common/web/input-processor/build.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env bash -# -# Compile KeymanWeb's 'keyboard-processor' module, one of the components of Web's 'core' module. -# -## START STANDARD BUILD SCRIPT INCLUDE -# adjust relative paths as necessary -THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" -## END STANDARD BUILD SCRIPT INCLUDE - -. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" - -BUNDLE_CMD="node $KEYMAN_ROOT/common/web/es-bundling/build/common-bundle.mjs" - -################################ Main script ################################ - -builder_describe "Builds the standalone, headless form of Keyman Engine for Web's input-processor module" \ - "@/common/web/keyman-version" \ - "@/common/web/keyboard-processor" \ - "@/common/predictive-text" \ - "@/developer/src/kmc-model test" \ - "clean" \ - "configure" \ - "build" \ - "test" \ - "--ci Sets $(builder_term test) action to use CI-based test configurations & reporting" - -builder_describe_outputs \ - configure /node_modules \ - build /common/web/input-processor/build/lib/index.mjs \ - -builder_parse "$@" - -function do_build() { - tsc -b ./tsconfig.json - - $BUNDLE_CMD "${KEYMAN_ROOT}/common/web/input-processor/build/obj/index.js" \ - --out "${KEYMAN_ROOT}/common/web/input-processor/build/lib/index.mjs" \ - --format esm - - # Declaration bundling. - tsc --emitDeclarationOnly --outFile ./build/lib/index.d.ts -} - -function do_test() { - local FLAGS= - if builder_has_option --ci; then - FLAGS="--reporter mocha-teamcity-reporter" - fi - - mocha --recursive $FLAGS ./tests/cases/ -} - -builder_run_action configure verify_npm_setup -builder_run_action clean rm -rf build/ -builder_run_action build do_build -builder_run_action test do_test \ No newline at end of file diff --git a/common/web/input-processor/package.json b/common/web/input-processor/package.json deleted file mode 100644 index 6a81cacde7..0000000000 --- a/common/web/input-processor/package.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "name": "@keymanapp/input-processor", - "description": "The core text and prediction processing engine for KeymanWeb", - "repository": { - "type": "git", - "url": "git+https://github.com/keymanapp/keyman.git" - }, - "keywords": [ - "input", - "languages", - "keyboards" - ], - "author": "SIL International", - "license": "MIT", - "bugs": { - "url": "https://github.com/keymanapp/keyman/issues" - }, - "homepage": "https://github.com/keymanapp/keyman#readme", - "devDependencies": { - "@keymanapp/kmc": "*", - "@keymanapp/resources-gosh": "*", - "mocha": "^10.0.0", - "mocha-teamcity-reporter": "^4.0.0", - "typescript": "^5.4.5" - }, - "scripts": { - "test": "gosh ./test.sh" - }, - "dependencies": { - "@keymanapp/keyboard-processor": "*", - "@keymanapp/lexical-model-layer": "*", - "@keymanapp/models-types": "*", - "@keymanapp/keyman-version": "*", - "@keymanapp/web-utils": "*", - "eventemitter3": "^5.0.0" - }, - "type": "module", - "main": "./build/obj/index.js", - "types": "./build/obj/index.d.ts", - "exports": { - ".": { - "es6-bundling": "./src/index.ts", - "default": "./build/obj/index.js" - }, - "./lib": { - "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.mjs" - }, - "./obj/*.js": "./build/obj/*.js" - } -} diff --git a/common/web/input-processor/src/index.ts b/common/web/input-processor/src/index.ts deleted file mode 100644 index 6747f42a23..0000000000 --- a/common/web/input-processor/src/index.ts +++ /dev/null @@ -1,10 +0,0 @@ -/// - -export * from './corrections.js'; -export * from './correctionLayout.js'; -export { default as InputProcessor } from './text/inputProcessor.js'; -export { default as ContextWindow } from './text/contextWindow.js'; -export { default as ModelSpec } from './text/prediction/modelSpec.js'; -export { default as LanguageProcessor, StateChangeEnum } from './text/prediction/languageProcessor.js'; -export { default as PredictionContext } from './text/prediction/predictionContext.js'; -export { TranscriptionCache } from './transcriptionCache.js'; \ No newline at end of file diff --git a/common/web/input-processor/tsconfig.json b/common/web/input-processor/tsconfig.json deleted file mode 100644 index 4551a235dc..0000000000 --- a/common/web/input-processor/tsconfig.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "../tsconfig.kmw-main-base.json", - "compilerOptions": { - "baseUrl": "./", - // Necessary for ES5 iteration of Map.keys(). - "downlevelIteration": true, - "outDir": "build/obj/", - "tsBuildInfoFile": "build/obj/tsconfig.tsbuildinfo", - "rootDir": "./src" - }, - "references": [ - { "path": "../utils" }, - { "path": "../keyboard-processor" }, - { "path": "../../predictive-text/tsconfig.all.json" }, - ], - // The extra .d.ts is necessary to avoid issues with lack of a Worker type definition when not including - // the standard DOM in the TS "lib" configuration. - "include": ["./src/**/*.ts", "../../predictive-text/src/worker-interface.d.ts"] -} diff --git a/common/web/keyboard-processor/.gitignore b/common/web/keyboard-processor/.gitignore deleted file mode 100644 index c613a78f7d..0000000000 --- a/common/web/keyboard-processor/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -# Build products -src/environment.inc.ts - -# Legacy build folders. -output/ -build/ -embedded/ - -# Current build output folder (matches standard node publish location). -dist/ - -# Other local files. -node_modules/ -unit_tests/modernizr.js -source/environment.inc.ts -.idea/**/*.xml -*.iml -*.kpj.user \ No newline at end of file diff --git a/common/web/keyboard-processor/build.sh b/common/web/keyboard-processor/build.sh deleted file mode 100755 index a7647983f9..0000000000 --- a/common/web/keyboard-processor/build.sh +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/env bash -# -# Compile KeymanWeb's 'keyboard-processor' module, one of the components of Web's 'core' module. -# -## START STANDARD BUILD SCRIPT INCLUDE -# adjust relative paths as necessary -THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" -## END STANDARD BUILD SCRIPT INCLUDE - -. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh" - -BUNDLE_CMD="node ${KEYMAN_ROOT}/common/web/es-bundling/build/common-bundle.mjs" - -################################ Main script ################################ - -builder_describe \ - "Compiles the web-oriented utility function module." \ - "@/common/web/recorder test" \ - "@/common/web/keyman-version" \ - "@/common/web/es-bundling" \ - "@/common/web/types" \ - "@/common/web/utils" \ - configure \ - clean \ - build \ - test \ - "--ci For use with action $(builder_term test) - emits CI-friendly test reports" - -builder_describe_outputs \ - configure /node_modules \ - build /common/web/keyboard-processor/build/lib/index.mjs - -builder_parse "$@" - -function do_configure() { - verify_npm_setup - - # Configure Web browser-engine testing environments. As is, this should only - # make changes when we update the dependency, even on our CI build agents. - playwright install -} - -function do_build() { - tsc --build "${THIS_SCRIPT_PATH}/tsconfig.all.json" - - # Base product - the main keyboard processor - builder_echo "Bundle base product - the main keyboard processor" - ${BUNDLE_CMD} "${KEYMAN_ROOT}/common/web/keyboard-processor/build/obj/index.js" \ - --out "${KEYMAN_ROOT}/common/web/keyboard-processor/build/lib/index.mjs" \ - --format esm - - # The DOM-oriented keyboard loader - builder_echo "Bundle the DOM-oriented keyboard loader" - ${BUNDLE_CMD} "${KEYMAN_ROOT}/common/web/keyboard-processor/build/obj/keyboards/loaders/dom-keyboard-loader.js" \ - --out "${KEYMAN_ROOT}/common/web/keyboard-processor/build/lib/dom-keyboard-loader.mjs" \ - --format esm - - # The Node-oriented keyboard loader - builder_echo "Bundle the Node-oriented keyboard loader" - ${BUNDLE_CMD} "${KEYMAN_ROOT}/common/web/keyboard-processor/build/obj/keyboards/loaders/node-keyboard-loader.js" \ - --out "${KEYMAN_ROOT}/common/web/keyboard-processor/build/lib/node-keyboard-loader.mjs" \ - --format esm \ - --platform node - - # Tests - builder_echo "Bundle tests" - ${BUNDLE_CMD} "${KEYMAN_ROOT}/common/web/keyboard-processor/build/tests/dom/cases/domKeyboardLoader.spec.js" \ - --out "${KEYMAN_ROOT}/common/web/keyboard-processor/build/tests/dom/domKeyboardLoader.spec.mjs" \ - --format esm - - # Declaration bundling. - builder_echo "Declaration bundling" - tsc --emitDeclarationOnly --outFile ./build/lib/index.d.ts - tsc --emitDeclarationOnly --outFile ./build/lib/dom-keyboard-loader.d.ts -p src/keyboards/loaders/tsconfig.dom.json - tsc --emitDeclarationOnly --outFile ./build/lib/node-keyboard-loader.d.ts -p src/keyboards/loaders/tsconfig.node.json -} - -function do_test() { - local MOCHA_FLAGS= - local WTR_CONFIG= - if builder_has_option --ci; then - echo "Replacing user-friendly test reports with CI-friendly versions." - MOCHA_FLAGS="$MOCHA_FLAGS --reporter mocha-teamcity-reporter" - WTR_CONFIG=.CI - fi - - c8 mocha --recursive $MOCHA_FLAGS ./tests/node/ - web-test-runner --config tests/dom/web-test-runner${WTR_CONFIG}.config.mjs -} - -builder_run_action configure do_configure -builder_run_action clean rm -rf ./build -builder_run_action build do_build -builder_run_action test do_test diff --git a/common/web/keyboard-processor/package.json b/common/web/keyboard-processor/package.json deleted file mode 100644 index 3f0a595897..0000000000 --- a/common/web/keyboard-processor/package.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "name": "@keymanapp/keyboard-processor", - "description": "Core module for Keyman keyboard support in KeymanWeb.", - "repository": { - "type": "git", - "url": "git+https://github.com/keymanapp/keyman.git" - }, - "keywords": [ - "input", - "languages", - "keyboards" - ], - "author": "SIL International", - "license": "MIT", - "bugs": { - "url": "https://github.com/keymanapp/keyman/issues" - }, - "homepage": "https://github.com/keymanapp/keyman#readme", - "devDependencies": { - "@keymanapp/resources-gosh": "*", - "c8": "^7.12.0", - "mocha": "^10.0.0", - "mocha-teamcity-reporter": "^4.0.0", - "typescript": "^5.4.5" - }, - "scripts": { - "build": "gosh build.sh", - "clean": "gosh build.sh clean", - "test": "gosh build.sh test" - }, - "dependencies": { - "@keymanapp/common-types": "*", - "@keymanapp/models-types": "*", - "@keymanapp/keyman-version": "*", - "@keymanapp/web-utils": "*" - }, - "type": "module", - "main": "./build/obj/index.js", - "types": "./build/obj/index.d.ts", - "exports": { - ".": { - "es6-bundling": "./src/index.ts", - "default": "./build/obj/index.js" - }, - "./node-keyboard-loader": { - "es6-bundling": "./src/keyboards/loaders/node-keyboard-loader.ts", - "types": "./build/obj/keyboards/loaders/node-keyboard-loader.d.ts", - "import": "./build/obj/keyboards/loaders/node-keyboard-loader.js" - }, - "./dom-keyboard-loader": { - "es6-bundling": "./src/keyboards/loaders/dom-keyboard-loader.ts", - "types": "./build/obj/keyboards/loaders/dom-keyboard-loader.d.ts", - "import": "./build/obj/keyboards/loaders/dom-keyboard-loader.js" - }, - "./lib": { - "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.mjs" - }, - "./lib/node-keyboard-loader": { - "types": "./build/lib/node-keyboard-loader.d.ts", - "import": "./build/lib/node-keyboard-loader.mjs" - }, - "./lib/dom-keyboard-loader": { - "types": "./build/lib/dom-keyboard-loader.d.ts", - "import": "./build/lib/dom-keyboard-loader.mjs" - }, - "./obj/*.js": "./build/obj/*.js" - } -} diff --git a/common/web/keyboard-processor/src/keyboards/loaders/tsconfig.dom.json b/common/web/keyboard-processor/src/keyboards/loaders/tsconfig.dom.json deleted file mode 100644 index 7ba2abe026..0000000000 --- a/common/web/keyboard-processor/src/keyboards/loaders/tsconfig.dom.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../../../tsconfig.kmw-main-base.json", - "compilerOptions": { - "baseUrl": "../../../", - "outDir": "../../../build/obj/keyboards/loaders/", - "tsBuildInfoFile": "../../../build/obj/keyboards/loaders/tsconfig.dom.tsbuildinfo", - "rootDir": "." - }, - "references": [ - { "path": "../../../tsconfig.json" } - ], - "include": ["dom-keyboard-loader.ts", "domKeyboardLoader.ts"], -} diff --git a/common/web/keyboard-processor/src/keyboards/loaders/tsconfig.node.json b/common/web/keyboard-processor/src/keyboards/loaders/tsconfig.node.json deleted file mode 100644 index 0be3f169ad..0000000000 --- a/common/web/keyboard-processor/src/keyboards/loaders/tsconfig.node.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../../../tsconfig.kmw-main-base.json", - "compilerOptions": { - "types": [ "node" ], - "baseUrl": "../../../", - "outDir": "../../../build/obj/keyboards/loaders/", - "tsBuildInfoFile": "../../../build/obj/keyboards/loaders/tsconfig.node.tsbuildinfo", - "rootDir": "." - }, - "references": [ - { "path": "../../../tsconfig.json" } - ], - "include": ["node-keyboard-loader.ts", "nodeKeyboardLoader.ts"], -} diff --git a/common/web/keyboard-processor/tests/dom/readme.md b/common/web/keyboard-processor/tests/dom/readme.md deleted file mode 100644 index 153b7f4a1e..0000000000 --- a/common/web/keyboard-processor/tests/dom/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -Automated tests in this subfolder and its children are designed to facilitate simple, browser-independent -unit tests that are DOM-reliant. - -Tests for anything that may reasonably vary depending upon the browser used to run the code should go under -the "integrated" folder instead. \ No newline at end of file diff --git a/common/web/keyboard-processor/tests/dom/web-test-runner.config.mjs b/common/web/keyboard-processor/tests/dom/web-test-runner.config.mjs deleted file mode 100644 index 76651182ac..0000000000 --- a/common/web/keyboard-processor/tests/dom/web-test-runner.config.mjs +++ /dev/null @@ -1,62 +0,0 @@ -// @ts-check -import { devices, playwrightLauncher } from '@web/test-runner-playwright'; -import { esbuildPlugin } from '@web/dev-server-esbuild'; -import { defaultReporter, summaryReporter } from '@web/test-runner'; -import { LauncherWrapper, sessionStabilityReporter } from '@keymanapp/common-test-resources/test-runner-stability-reporter.mjs'; -import { importMapsPlugin } from '@web/dev-server-import-maps'; -import { dirname, resolve } from 'path'; -import { fileURLToPath } from 'url'; - -const dir = dirname(fileURLToPath(import.meta.url)); -const KEYMAN_ROOT = resolve(dir, '../../../../..'); - -/** @type {import('@web/test-runner').TestRunnerConfig} */ -export default { - // debug: true, - browsers: [ - new LauncherWrapper(playwrightLauncher({ product: 'chromium' })), - new LauncherWrapper(playwrightLauncher({ product: 'firefox' })), - new LauncherWrapper(playwrightLauncher({ product: 'webkit', concurrency: 1 })), - ], - concurrency: 10, - nodeResolve: true, - files: [ - 'build/tests/dom/**/*.spec.mjs' - ], - middleware: [ - // Rewrites short-hand paths for test resources, making them fully relative to the repo root. - function rewriteResourcePath(context, next) { - if(context.url.startsWith('/resources/')) { - context.url = '/common/test' + context.url; - } - - return next(); - } - ], - plugins: [ - esbuildPlugin({ts: true, target: 'auto'}), - importMapsPlugin({ - inject: { - importMap: { - // Redirects `eventemitter3` imports to the bundled ESM library. The standard import is an - // ESM wrapper around the CommonJS implementation, and WTR fails when it hits the CommonJS. - imports: { - 'eventemitter3': '/node_modules/eventemitter3/dist/eventemitter3.esm.js' - } - } - } - }) - ], - reporters: [ - summaryReporter({}), /* local-dev mocha-style */ - sessionStabilityReporter({}), - defaultReporter({}) - ], - /* - Un-comment the next two lines for easy interactive debugging; it'll launch the - test page in your preferred browser. - */ - // open: true, - // manual: true, - rootDir: KEYMAN_ROOT -} diff --git a/common/web/keyboard-processor/tests/tsconfig.json b/common/web/keyboard-processor/tests/tsconfig.json deleted file mode 100644 index 0e978545b8..0000000000 --- a/common/web/keyboard-processor/tests/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "baseUrl": "../", - "outDir": "../build/tests/", - "tsBuildInfoFile": "../build/tests/tsconfig.tsbuildinfo", - "rootDir": "./" - }, - "include": [ "./dom/**/*.ts"], - "exclude": [] -} diff --git a/common/web/keyboard-processor/tsconfig.json b/common/web/keyboard-processor/tsconfig.json deleted file mode 100644 index 728935b74f..0000000000 --- a/common/web/keyboard-processor/tsconfig.json +++ /dev/null @@ -1,18 +0,0 @@ -// Is used by the keyboard-loader submodules. -{ - "extends": "../tsconfig.kmw-main-base.json", - "compilerOptions": { - "baseUrl": "./", - "outDir": "build/obj/", - "tsBuildInfoFile": "build/obj/tsconfig.tsbuildinfo", - "rootDir": "./src/" - }, - "references": [ - { "path": "../types" }, - { "path": "../../models/types" }, - { "path": "../keyman-version/" }, - { "path": "../utils/" } - ], - "include": [ "./src/**/*.ts"], - "exclude": ["./src/keyboards/loaders/**/*.ts"] -} diff --git a/common/web/lm-message-types/tsconfig.json b/common/web/lm-message-types/tsconfig.json deleted file mode 100644 index 559b764980..0000000000 --- a/common/web/lm-message-types/tsconfig.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "declaration": true, - "outDir": "build/", - "sourceMap": true, - "lib": ["es6"], - "target": "es6" - }, - "include": ["./*.ts"], - "exclude": ["test.ts"] -} diff --git a/common/web/lm-worker/src/main/correction/context-tracker.ts b/common/web/lm-worker/src/main/correction/context-tracker.ts deleted file mode 100644 index 2f15165e5e..0000000000 --- a/common/web/lm-worker/src/main/correction/context-tracker.ts +++ /dev/null @@ -1,597 +0,0 @@ -import { applyTransform, tokenize } from '@keymanapp/models-templates'; -import { defaultWordbreaker } from '@keymanapp/models-wordbreakers'; - -import { ClassicalDistanceCalculation } from './classical-calculation.js'; -import { SearchSpace } from './distance-modeler.js'; -import TransformUtils from '../transformUtils.js'; - -function textToCharTransforms(text: string, transformId?: number) { - let perCharTransforms: Transform[] = []; - - for(let i=0; i < text.kmwLength(); i++) { - let char = text.kmwCharAt(i); // is SMP-aware - - let transform: Transform = { - insert: char, - deleteLeft: 0, - id: transformId - }; - - perCharTransforms.push(transform); - } - - return perCharTransforms; -} - -export class TrackedContextSuggestion { - suggestion: Suggestion; - tokenWidth: number; -} - -export class TrackedContextToken { - raw: string; - replacementText: string; - - transformDistributions: Distribution[] = []; - replacements: TrackedContextSuggestion[]; - activeReplacementId: number = -1; - - get currentText(): string { - if(this.replacementText === undefined || this.replacementText === null) { - return this.raw; - } else { - return this.replacementText; - } - } - - get replacement(): TrackedContextSuggestion { - let replacementId = this.activeReplacementId; - return this.replacements.find(function(replacement) { - return replacement.suggestion.id == replacementId; - }); - } - - revert() { - delete this.activeReplacementId; - } -} - -export class TrackedContextState { - // Stores the post-transform Context. Useful as a debugging reference, but also used to - // pre-validate context state matches in case of discarded changes from multitaps. - taggedContext: Context; - model: LexicalModel; - - tokens: TrackedContextToken[]; - /** - * How many tokens were removed from the start of the best-matching ancestor. - * Useful for restoring older states, e.g., when the user moves the caret backwards, we can recover the context at that position. - */ - indexOffset: number; - - // Tracks all search spaces starting at the current token. - // In the lm-layer's current form, this should only ever have one entry. - // Leaves 'design space' for if/when we add support for phrase-level corrections/predictions. - searchSpace: SearchSpace[] = []; - - constructor(source: TrackedContextState); - constructor(model: LexicalModel); - constructor(obj: TrackedContextState | LexicalModel) { - if(obj instanceof TrackedContextState) { - let source = obj; - // Be sure to deep-copy the tokens! Pointer-aliasing is bad here. - this.tokens = source.tokens.map(function(token) { - let copy = new TrackedContextToken(); - copy.raw = token.raw; - copy.replacements = [].concat(token.replacements); - copy.activeReplacementId = token.activeReplacementId; - copy.transformDistributions = [].concat(token.transformDistributions); - - if(token.replacementText) { - copy.replacementText = token.replacementText; - } - - return copy; - }); - - this.indexOffset = 0; - const lexicalModel = this.model = obj.model; - this.taggedContext = obj.taggedContext; - - if(lexicalModel?.traverseFromRoot) { - // We need to construct a separate search space from other ContextStates. - // - // In case we are unable to perfectly track context (say, due to multitaps) - // we need to ensure that only fully-utilized keystrokes are considered. - this.searchSpace = obj.searchSpace.map((space) => new SearchSpace(space)); - } - } else { - let lexicalModel = obj; - this.tokens = []; - this.indexOffset = Number.MIN_SAFE_INTEGER; - this.model = lexicalModel; - - if(lexicalModel && lexicalModel.traverseFromRoot) { - this.searchSpace = [new SearchSpace(lexicalModel)]; - } - } - } - - get head(): TrackedContextToken { - return this.tokens[0]; - } - - get tail(): TrackedContextToken { - return this.tokens[this.tokens.length - 1]; - } - - popHead() { - this.tokens.splice(0, 2); - this.indexOffset -= 1; - } - - pushTail(token: TrackedContextToken) { - if(this.model && this.model.traverseFromRoot) { - this.searchSpace = [new SearchSpace(this.model)]; // yeah, need to update SearchSpace for compatibility - } else { - this.searchSpace = []; - } - this.tokens.push(token); - - let state = this; - if(state.searchSpace.length > 0) { - token.transformDistributions.forEach(distrib => state.searchSpace[0].addInput(distrib)); - } - } - - pushWhitespaceToTail(transformDistribution: Distribution = null) { - let whitespaceToken = new TrackedContextToken(); - - // Track the Transform that resulted in the whitespace 'token'. - // Will be needed for phrase-level correction/prediction. - whitespaceToken.transformDistributions = transformDistribution ? [transformDistribution] : []; - - whitespaceToken.raw = null; - this.tokens.push(whitespaceToken); - } - - /** - * Used for 14.0's backspace workaround, which flattens all previous Distribution - * entries because of limitations with direct use of backspace transforms. - * @param tokenText - * @param transformId - */ - replaceTailForBackspace(tokenText: USVString, transformId: number) { - this.tokens.pop(); - - // It's a backspace transform; time for special handling! - // - // For now, with 14.0, we simply compress all remaining Transforms for the token into - // multiple single-char transforms. Probabalistically modeling BKSP is quite complex, - // so we simplify by assuming everything remaining after a BKSP is 'true' and 'intended' text. - // - // Note that we cannot just use a single, monolithic transform at this point b/c - // of our current edit-distance optimization strategy; diagonalization is currently... - // not very compatible with that. - let backspacedTokenContext: Distribution[] = textToCharTransforms(tokenText, transformId).map(function(transform) { - return [{sample: transform, p: 1.0}]; - }); - - let compactedToken = new TrackedContextToken(); - compactedToken.raw = tokenText; - compactedToken.transformDistributions = backspacedTokenContext; - this.pushTail(compactedToken); - } - - updateTail(transformDistribution: Distribution, tokenText?: USVString) { - let editedToken = this.tail; - - // Preserve existing text if new text isn't specified. - tokenText = tokenText || (tokenText === '' ? '' : editedToken.raw); - - if(transformDistribution && transformDistribution.length > 0) { - editedToken.transformDistributions.push(transformDistribution); - if(this.searchSpace) { - this.searchSpace.forEach(space => space.addInput(transformDistribution)); - } - } - // Replace old token's raw-text with new token's raw-text. - editedToken.raw = tokenText; - } - - toRawTokenization() { - let sequence: USVString[] = []; - - for(let token of this.tokens) { - // Hide any tokens representing wordbreaks. (Thinking ahead to phrase-level possibilities) - if(token.currentText !== null) { - sequence.push(token.currentText); - } - } - - return sequence; - } -} - -class CircularArray { - static readonly DEFAULT_ARRAY_SIZE = 5; - private circle: Item[]; - private currentHead: number=0; - private currentTail: number=0; - - constructor(size: number = CircularArray.DEFAULT_ARRAY_SIZE) { - this.circle = Array(size); - } - - get count(): number { - let diff = this.currentHead - this.currentTail; - - if(diff < 0) { - diff = diff + this.circle.length; - } - - return diff; - } - - get maxCount(): number { - return this.circle.length; - } - - get oldest(): Item { - if(this.count == 0) { - return undefined; - } - - return this.item(0); - } - - get newest(): Item { - if(this.count == 0) { - return undefined; - } - - return this.item(this.count - 1); - } - - enqueue(item: Item): Item { - var prevItem = null; - let nextHead = (this.currentHead + 1) % this.maxCount; - - if(nextHead == this.currentTail) { - prevItem = this.circle[this.currentTail]; - this.currentTail = (this.currentTail + 1) % this.maxCount; - } - - this.circle[this.currentHead] = item; - this.currentHead = nextHead; - - return prevItem; - } - - dequeue(): Item { - if(this.currentTail == this.currentHead) { - return null; - } else { - let item = this.circle[this.currentTail]; - this.currentTail = (this.currentTail + 1) % this.maxCount; - return item; - } - } - - popNewest(): Item { - if(this.currentTail == this.currentHead) { - return null; - } else { - let item = this.circle[this.currentHead]; - this.currentHead = (this.currentHead - 1 + this.maxCount) % this.maxCount; - return item; - } - } - - /** - * Returns items contained within the circular array, ordered from 'oldest' to 'newest' - - * the same order in which the items will be dequeued. - * @param index - */ - item(index: number) { - if(index >= this.count) { - throw "Invalid array index"; - } - - let mappedIndex = (this.currentTail + index) % this.maxCount; - return this.circle[mappedIndex]; - } -} - -export class ContextTracker extends CircularArray { - static attemptMatchContext(tokenizedContext: USVString[], - matchState: TrackedContextState, - transformDistribution?: Distribution): TrackedContextState { - // Map the previous tokenized state to an edit-distance friendly version. - let matchContext: USVString[] = matchState.toRawTokenization(); - - // Inverted order, since 'match' existed before our new context. - let mapping = ClassicalDistanceCalculation.computeDistance(matchContext.map(value => ({key: value})), - tokenizedContext.map(value => ({key: value})), - 1); - - let editPath = mapping.editPath(); - - let poppedHead = false; - let pushedTail = false; - - // Matters greatly when starting from a nil context. - if(editPath.length > 1) { - // First entry: may not be an 'insert' or a 'transpose' op. - // 'insert' allowed if the next token is 'substitute', as this may occur with an edit path of length 2. - if((editPath[0] == 'insert' && !(editPath[1] == 'substitute' && editPath.length == 2)) || editPath[0].indexOf('transpose') >= 0) { - return null; - } else if(editPath[0] == 'delete') { - poppedHead = true; // a token from the previous state has been wholly removed. - } - } - - // Last entry: may not be a 'delete' or a 'transpose' op. - let tailIndex = editPath.length -1; - let ignorePenultimateMatch = false; - if(editPath[tailIndex] == 'delete' || editPath[0].indexOf('transpose') >= 0) { - return null; - } else if(editPath[tailIndex] == 'insert') { - pushedTail = true; - } else if(tailIndex > 0 && editPath[tailIndex-1] == 'insert' && editPath[tailIndex] == 'substitute') { - // Tends to happen when accepting suggestions. - pushedTail = true; - ignorePenultimateMatch = true; - } - - // Can happen for the first text input after backspace deletes a wordbreaking character, - // thus the new input continues a previous word while dropping the empty word after - // that prior wordbreaking character. - // - // We can't handle it reliably from this match state, but a previous entry (without the empty token) - // should still be in the cache and will be reliable for this example case. - if(tailIndex > 0 && editPath[tailIndex-1] == 'delete' && editPath[tailIndex] == 'substitute') { - return null; - } - - // Now to check everything in-between: should be exclusively 'match'es. - for(let index = 1; index < editPath.length - (ignorePenultimateMatch ? 2 : 1); index++) { - if(editPath[index] != 'match') { - return null; - } - } - - // If we've made it here... success! We have a context match! - let state: TrackedContextState; - - if(pushedTail) { - // On suggestion acceptance, we should update the previous final token. - // We do it first so that the acceptance is replicated in the new TrackedContextState - // as well. - if(ignorePenultimateMatch) { - // For this case, we were likely called by ModelCompositor.acceptSuggestion(), which - // would have marked the accepted suggestion. - matchState.tail.replacementText = tokenizedContext[tokenizedContext.length-2]; - } - - state = new TrackedContextState(matchState); - } else { - // We're continuing a previously-cached context; create a deep-copy of it. - // We can't just re-use the old instance, unfortunately; predictions break - // with multitaps otherwise - we should avoid tracking keystrokes that were - // rewound. - // - // If there are no incoming transforms, though... yeah, re-use is safe then. - state = !!transformDistribution ? new TrackedContextState(matchState) : matchState; - } - - const hasDistribution = transformDistribution && Array.isArray(transformDistribution); - let primaryInput = hasDistribution ? transformDistribution[0].sample : null; - if(primaryInput && primaryInput.insert == "" && primaryInput.deleteLeft == 0 && !primaryInput.deleteRight) { - primaryInput = null; - } - - const isWhitespace = primaryInput && TransformUtils.isWhitespace(primaryInput); - const isBackspace = primaryInput && TransformUtils.isBackspace(primaryInput); - const finalToken = tokenizedContext[tokenizedContext.length-1]; - - /* Assumption: This is an adequate check for its two sub-branches. - * - * Basis: - * - Assumption: one keystroke may only cause a single token to rotate out of context. - * - That is, no "reasonable" keystroke would emit enough code points to 'bump' two words simultaneously. - * - ... This one may need to be loosened a bit... but it should be enough for initial correction testing as-is. - * - Assumption: one keystroke may only cause a single token to be appended to the context - * - That is, no "reasonable" keystroke would emit a Transform adding two separate word tokens - * - For languages using whitespace to word-break, said keystroke would have to include said whitespace to break the assumption. - */ - - function maintainLastToken() { - if(isWhitespace && editPath[tailIndex] == 'match') { - /* - We can land here if there are multiple whitespaces in a row. - There's already an implied whitespace to the left, so we conceptually - merge the new whitespace with that one. - */ - return; - } else if(isBackspace) { - // Consider backspace entry for this case? - state.replaceTailForBackspace(finalToken, primaryInput.id); - } else { - state.updateTail(primaryInput ? transformDistribution : null, finalToken); - } - } - - // If there is/was more than one context token available... - if(editPath.length > 1) { - // We're removing a context token, but at least one remains. - if(poppedHead) { - state.popHead(); - } - - // We're adding an additional context token. - if(pushedTail) { - const tokenizedTail = tokenizedContext[tokenizedContext.length - 1]; - /* - * Common-case: most transforms that trigger this case are from pure-whitespace Transforms. MOST. - * - * Less-common, but noteworthy: some wordbreaks may occur without whitespace. Example: - * `"o` => ['"', 'o']. Make sure to double-check against `tokenizedContext`! - */ - let pushedToken = new TrackedContextToken(); - pushedToken.raw = tokenizedTail; - - if(isWhitespace || !primaryInput) { - state.pushWhitespaceToTail(transformDistribution ?? []); - // Continuing the earlier assumption, that 'pure-whitespace Transform' does not emit any initial characters - // for the new word (token), so the input keystrokes do not correspond to the new text token. - pushedToken.transformDistributions = []; - } else { - state.pushWhitespaceToTail(); - // Assumption: Since we only allow one-transform-at-a-time changes between states, we shouldn't be missing - // any metadata used to construct the new context state token. - pushedToken.transformDistributions = transformDistribution ? [transformDistribution] : []; - } - - state.pushTail(pushedToken); - } else { - // We're editing the final context token. - // TODO: Assumption: we didn't 'miss' any inputs somehow. - // As is, may be prone to fragility should the lm-layer's tracked context 'desync' from its host's. - maintainLastToken(); - } - // There is only one word in the context. - } else { - // TODO: Assumption: we didn't 'miss' any inputs somehow. - // As is, may be prone to fragility should the lm-layer's tracked context 'desync' from its host's. - - if(editPath[tailIndex] == 'insert') { - // Construct appropriate initial token. - let token = new TrackedContextToken(); - token.raw = tokenizedContext[0]; - token.transformDistributions = [transformDistribution]; - state.pushTail(token); - } else { - // Edit the lone context token. - maintainLastToken(); - } - } - return state; - } - - private static modelContextState(tokenizedContext: USVString[], - transformDistribution: Distribution, - lexicalModel: LexicalModel): TrackedContextState { - let baseTokens = tokenizedContext.map(function(entry) { - let token = new TrackedContextToken(); - token.raw = entry; - if(token.raw) { - token.transformDistributions = textToCharTransforms(token.raw).map(function(transform) { - return [{sample: transform, p: 1.0}]; - }); - } else { - // Helps model context-final wordbreaks. - token.transformDistributions = []; - } - return token; - }); - - // And now build the final context state object, which includes whitespace 'tokens'. - let state = new TrackedContextState(lexicalModel); - - if(baseTokens.length > 0) { - state.pushTail(baseTokens.splice(0, 1)[0]); - } - - while(baseTokens.length > 0) { - state.pushWhitespaceToTail(); - state.pushTail(baseTokens.splice(0, 1)[0]); - } - - if(state.tokens.length == 0) { - let token = new TrackedContextToken(); - token.raw = ''; - - state.pushTail(token); - } - - return state; - } - - /** - * Compares the current, post-input context against the most recently-seen contexts from previous prediction calls, returning - * the most information-rich `TrackedContextState` possible. If a match is found, the state will be annotated with the - * input information provided to previous prediction calls and persisted correction-search calculations for re-use. - * - * @param model - * @param context - * @param transformDistribution - */ - analyzeState(model: LexicalModel, - context: Context, - transformDistribution?: Distribution): TrackedContextState { - if(!model.traverseFromRoot) { - // Assumption: LexicalModel provides a valid traverseFromRoot function. (Is technically optional) - // Without it, no 'corrections' may be made; the model can only be used to predict, not correct. - throw "This lexical model does not provide adequate data for correction algorithms and context reuse"; - } - - let tokenizedContext = tokenize(model.wordbreaker || defaultWordbreaker, context); - - if(tokenizedContext.left.length > 0) { - for(let i = this.count - 1; i >= 0; i--) { - const priorMatchState = this.item(i); - const priorTaggedContext = priorMatchState.taggedContext; - if(priorTaggedContext && transformDistribution && transformDistribution.length > 0) { - // Using the potential `matchState` + the incoming transform, do the results line up for - // our observed context? If not, skip it. - // - // Necessary to properly handle multitaps, as there are context rewinds that the - // predictive-text engine is not otherwise warned about. - // - // `priorTaggedContext` must not be `null`! - const doublecheckContext = applyTransform(transformDistribution[0].sample, priorTaggedContext); - if(doublecheckContext.left != context.left) { - continue; - } - } else if(priorTaggedContext?.left != context.left) { - continue; - } - - let resultState = ContextTracker.attemptMatchContext(tokenizedContext.left, this.item(i), transformDistribution); - - if(resultState) { - // Keep it reasonably current! And it's probably fine to have it more than once - // in the history. However, if it's the most current already, there's no need - // to refresh it. - if(this.newest != resultState && this.newest != priorMatchState) { - // Already has a taggedContext. - this.enqueue(priorMatchState); - } - - resultState.taggedContext = context; - if(resultState != this.item(i)) { - this.enqueue(resultState); - } - return resultState; - } - } - } - - // Else: either empty OR we've detected a 'new context'. Initialize from scratch; no prior input information is - // available. Only the results of the prior inputs are known. - // - // Assumption: as a caret needs to move to context before any actual transform distributions occur, - // this state is only reached on caret moves; thus, transformDistribution is actually just a single null transform. - let state = ContextTracker.modelContextState(tokenizedContext.left, transformDistribution, model); - state.taggedContext = context; - this.enqueue(state); - return state; - } - - clearCache() { - while(this.count > 0) { - this.dequeue(); - } - } -} diff --git a/common/web/lm-worker/src/test/mocha/cases/edit-distance/context-tracker.js b/common/web/lm-worker/src/test/mocha/cases/edit-distance/context-tracker.js deleted file mode 100644 index 5c9d4812b6..0000000000 --- a/common/web/lm-worker/src/test/mocha/cases/edit-distance/context-tracker.js +++ /dev/null @@ -1,189 +0,0 @@ -import { assert } from 'chai'; - -import { ContextTracker } from '#./correction/context-tracker.js'; -import ModelCompositor from '#./model-compositor.js'; -import * as models from '#./models/index.js'; - -import { jsonFixture } from '@keymanapp/common-test-resources/model-helpers.mjs'; - -describe('ContextTracker', function() { - function toWrapperDistribution(transform) { - return [{ - sample: transform, - p: 1.0 - }]; - } - - describe('attemptMatchContext', function() { - it("properly matches and aligns when lead token is removed", function() { - let existingContext = ["an", "apple", "a", "day", "keeps", "the", "doctor"]; - let transform = { - insert: '', - deleteLeft: 0 - } - let newContext = existingContext.slice(0); - newContext.splice(0, 1); - let rawTokens = ["apple", null, "a", null, "day", null, "keeps", null, "the", null, "doctor"]; - - let existingState = ContextTracker.modelContextState(existingContext); - let state = ContextTracker.attemptMatchContext(newContext, existingState, null, toWrapperDistribution(transform)); - assert.isNotNull(state); - assert.deepEqual(state.tokens.map(token => token.raw), rawTokens); - }); - - it("properly matches and aligns when final token is edited", function() { - let existingContext = ["an", "apple", "a", "day", "keeps", "the", "docto"]; - let transform = { - insert: 'r', - deleteLeft: 0 - } - let newContext = existingContext.slice(0); - newContext[newContext.length - 1] = 'doctor'; - let rawTokens = ["an", null, "apple", null, "a", null, "day", null, "keeps", null, "the", null, "doctor"]; - - let existingState = ContextTracker.modelContextState(existingContext); - let state = ContextTracker.attemptMatchContext(newContext, existingState, null, toWrapperDistribution(transform)); - assert.isNotNull(state); - assert.deepEqual(state.tokens.map(token => token.raw), rawTokens); - }); - - it("properly matches and aligns when a 'wordbreak' is added", function() { - let existingContext = ["an", "apple", "a", "day", "keeps", "the", "doctor"]; - let transform = { - insert: ' ', - deleteLeft: 0 - } - let newContext = existingContext.slice(0); - newContext.push(''); - let rawTokens = ["an", null, "apple", null, "a", null, "day", null, "keeps", null, "the", null, "doctor", null, ""]; - - let existingState = ContextTracker.modelContextState(existingContext); - let state = ContextTracker.attemptMatchContext(newContext, existingState, toWrapperDistribution(transform)); - assert.isNotNull(state); - assert.deepEqual(state.tokens.map(token => token.raw), rawTokens); - - // The 'wordbreak' transform - assert.isNotEmpty(state.tokens[state.tokens.length - 2].transformDistributions); - assert.isEmpty(state.tokens[state.tokens.length - 1].transformDistributions); - }); - - it("properly matches and aligns when an implied 'wordbreak' occurs (as when following \"'\")", function() { - let existingContext = ["'"]; - let transform = { - insert: 'a', - deleteLeft: 0 - } - let newContext = existingContext.slice(0); - newContext.push('a'); // The incoming transform should produce a new token WITH TEXT. - let rawTokens = ["'", null, "a"]; - - let existingState = ContextTracker.modelContextState(existingContext); - let state = ContextTracker.attemptMatchContext(newContext, existingState, toWrapperDistribution(transform)); - assert.isNotNull(state); - assert.deepEqual(state.tokens.map(token => token.raw), rawTokens); - - // The 'wordbreak' transform - assert.isEmpty(state.tokens[state.tokens.length - 2].transformDistributions); - assert.isNotEmpty(state.tokens[state.tokens.length - 1].transformDistributions); - }); - - it("properly matches and aligns when lead token is removed AND a 'wordbreak' is added'", function() { - let existingContext = ["an", "apple", "a", "day", "keeps", "the", "doctor"]; - let transform = { - insert: ' ', - deleteLeft: 0 - } - let newContext = existingContext.slice(0); - newContext.splice(0, 1); - newContext.push(''); - let rawTokens = ["apple", null, "a", null, "day", null, "keeps", null, "the", null, "doctor", null, ""]; - - let existingState = ContextTracker.modelContextState(existingContext); - let state = ContextTracker.attemptMatchContext(newContext, existingState, toWrapperDistribution(transform)); - assert.isNotNull(state); - assert.deepEqual(state.tokens.map(token => token.raw), rawTokens); - - // The 'wordbreak' transform - assert.isNotEmpty(state.tokens[state.tokens.length - 2].transformDistributions); - assert.isEmpty(state.tokens[state.tokens.length - 1].transformDistributions); - }); - }); - - describe('modelContextState', function() { - it('models without final wordbreak', function() { - let context = ["an", "apple", "a", "day", "keeps", "the", "doctor"]; - let rawTokens = ["an", null, "apple", null, "a", null, "day", null, "keeps", null, "the", null, "doctor"]; - - let state = ContextTracker.modelContextState(context); - assert.deepEqual(state.tokens.map(token => token.raw), rawTokens); - }); - - it('models with final wordbreak', function() { - let context = ["an", "apple", "a", "day", "keeps", "the", "doctor", ""]; - let rawTokens = ["an", null, "apple", null, "a", null, "day", null, "keeps", null, "the", null, "doctor", null, ""]; - - let state = ContextTracker.modelContextState(context); - assert.deepEqual(state.tokens.map(token => token.raw), rawTokens); - }); - }); - - describe('suggestion acceptance tracking', function() { - let englishPunctuation = { - quotesForKeepSuggestion: { open: `“`, close: `”`}, - insertAfterWord: ' ' - }; - - it('tracks an accepted suggestion', function() { - let baseSuggestion = { - transform: { - insert: 'world ', - deleteLeft: 3, - id: 0 - }, - transformId: 0, - id: 1, - displayAs: 'world' - }; - - let baseContext = { - left: 'hello wor', startOfBuffer: true, endOfBuffer: true - }; - - // Represents the keystroke that triggered the suggestion. It's not technically part - // of the Context when the suggestion is built. - let postTransform = { - insert: 'l', - deleteLeft: 0 - }; - - let options = { - punctuation: englishPunctuation - }; - - let model = new models.TrieModel(jsonFixture('models/tries/english-1000'), options); - let compositor = new ModelCompositor(model); - let baseContextState = compositor.contextTracker.analyzeState(model, baseContext); - - baseContextState.tail.replacements = [{ - suggestion: baseSuggestion, - tokenWidth: 1 - }]; - - let reversion = compositor.acceptSuggestion(baseSuggestion, baseContext, postTransform); - - // Actual test assertion - was the replacement tracked? - assert.equal(baseContextState.tail.activeReplacementId, baseSuggestion.id); - assert.equal(reversion.id, -baseSuggestion.id); - - // Next step - on the followup context, is the replacement still active? - let postContext = models.applyTransform(baseSuggestion.transform, baseContext); - let postContextState = compositor.contextTracker.analyzeState(model, postContext); - - // Penultimate token corresponds to whitespace, which does not have a 'raw' representation. - assert.isNull(postContextState.tokens[postContextState.tokens.length - 2].raw); - - // Final token is empty (follows a wordbreak) - assert.equal(postContextState.tail.raw, ''); - }); - }); -}); \ No newline at end of file diff --git a/common/web/lm-worker/src/test/test-runner/web-test-runner.CI.config.mjs b/common/web/lm-worker/src/test/test-runner/web-test-runner.CI.config.mjs deleted file mode 100644 index d18a8a9cb0..0000000000 --- a/common/web/lm-worker/src/test/test-runner/web-test-runner.CI.config.mjs +++ /dev/null @@ -1,13 +0,0 @@ -// @ts-check -import BASE_CONFIG from './web-test-runner.config.mjs'; -import teamcityReporter from '@keymanapp/common-test-resources/test-runner-TC-reporter.mjs'; -import { sessionStabilityReporter } from '@keymanapp/common-test-resources/test-runner-stability-reporter.mjs'; - -/** @type {import('@web/test-runner').TestRunnerConfig} */ -export default { - ...BASE_CONFIG, - reporters: [ - teamcityReporter(), /* custom-written, for CI-friendly reports */ - sessionStabilityReporter({ciMode: true}) - ] -} \ No newline at end of file diff --git a/common/web/lm-worker/tsconfig.json b/common/web/lm-worker/tsconfig.json deleted file mode 100644 index f439e96940..0000000000 --- a/common/web/lm-worker/tsconfig.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "extends": "../../models/tsconfig.kmw-worker-base.json", - - "compilerOptions": { - "baseUrl": "./", - "outDir": "build/obj", - "tsBuildInfoFile": "build/obj/tsconfig.tsbuildinfo", - "rootDir": "./src/main", - - // As this one is the one that directly interfaces with the worker (from the inside) - "lib": ["webworker", "es6"], - }, - "references": [ - // types - { "path": "../../models/types" }, - { "path": "../lm-message-types" }, - // modules - { "path": "../keyman-version" }, - { "path": "../utils" }, - { "path": "../../models/templates" }, - { "path": "../../models/wordbreakers" }, - ], - "include": [ - "src/main/**/*.ts" - ] -} diff --git a/common/web/recorder/tsconfig.json b/common/web/recorder/tsconfig.json deleted file mode 100644 index 1a38d48f03..0000000000 --- a/common/web/recorder/tsconfig.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "extends": "../tsconfig.kmw-main-base.json", - - "compilerOptions": { - "types": ["node"], - "baseUrl": "./", - "outDir": "build/obj/", - "tsBuildInfoFile": "build/obj/tsconfig.tsbuildinfo", - "rootDir": "./src" - }, - - "include": [ - "src/**/*.ts" - ], - - "references": [ - { "path": "../keyman-version" }, - { "path": "../utils/" }, - { "path": "../keyboard-processor/" }, - { "path": "../lm-message-types" } - ], -} diff --git a/common/web/types/build.sh b/common/web/types/build.sh index df11540b42..7141bc1072 100755 --- a/common/web/types/build.sh +++ b/common/web/types/build.sh @@ -73,40 +73,25 @@ function compile_schemas() { node tools/schema-bundler.js } -function copy_cldr_imports() { - # Store CLDR imports - # load all versions that have a cldr_info.json - for CLDR_INFO_PATH in "$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/"*/cldr_info.json - do - # TODO-LDML: developer/src/inst/download.in.mak needs these also... - CLDR_PATH=$(dirname "$CLDR_INFO_PATH") - CLDR_VER=$(basename "$CLDR_PATH") - mkdir -p "$THIS_SCRIPT_PATH/build/src/import/$CLDR_VER" - # TODO-LDML: When these are copied, the DOCTYPE will break due to the wrong path. We don't use the DTD so it should be OK. - cp "$CLDR_INFO_PATH" "$CLDR_PATH/import/"*.xml "$THIS_SCRIPT_PATH/build/src/import/$CLDR_VER/" - done -} function do_configure() { compile_schemas verify_npm_setup } -function do_build() { - copy_cldr_imports - tsc --build -} - function do_test() { eslint . tsc --build test - c8 --skip-full --reporter=lcov --reporter=text mocha "${builder_extra_params[@]}" + readonly C8_THRESHOLD=50 + c8 -skip-full --reporter=lcov --reporter=text --lines $C8_THRESHOLD --statements $C8_THRESHOLD --branches $C8_THRESHOLD --functions $C8_THRESHOLD mocha "${builder_extra_params[@]}" + builder_echo warning "Coverage thresholds are currently $C8_THRESHOLD%, which is lower than ideal." + builder_echo warning "Please increase threshold in build.sh as test coverage improves." } #------------------------------------------------------------------------------------------------------------------- builder_run_action clean rm -rf ./build/ ./tsconfig.tsbuildinfo builder_run_action configure do_configure -builder_run_action build do_build +builder_run_action build tsc --build builder_run_action test do_test builder_run_action publish builder_publish_npm diff --git a/common/web/types/package.json b/common/web/types/package.json index 9327e48590..20f84bc140 100644 --- a/common/web/types/package.json +++ b/common/web/types/package.json @@ -31,24 +31,17 @@ "dependencies": { "@keymanapp/ldml-keyboard-constants": "*", "@keymanapp/keyman-version": "*", - "restructure": "3.0.1", - "semver": "^7.5.2", - "sax": ">=0.6.0", - "xmlbuilder": "~11.0.0" + "restructure": "3.0.1" }, "devDependencies": { "@types/chai": "^4.1.7", - "@types/git-diff": "^2.0.3", "@types/mocha": "^5.2.7", "@types/node": "^20.4.1", - "@types/semver": "^7.3.12", - "@types/xml2js": "^0.4.5", "ajv": "^8.12.0", "ajv-cli": "^5.0.0", "ajv-formats": "^2.1.1", "c8": "^7.12.0", "chalk": "^2.4.2", - "git-diff": "^2.0.6", "hexy": "^0.3.4", "mocha": "^8.4.0", "typescript": "^5.4.5" diff --git a/common/web/types/src/consts/modifier-key-constants.ts b/common/web/types/src/consts/modifier-key-constants.ts new file mode 100644 index 0000000000..245cbf70f3 --- /dev/null +++ b/common/web/types/src/consts/modifier-key-constants.ts @@ -0,0 +1,33 @@ +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * Modifier key bit-flags + */ + +export const ModifierKeyConstants = { + // Define Keyman Developer modifier bit-flags (exposed for use by other modules) + // Compare against /common/include/kmx_file.h. CTRL+F "#define LCTRLFLAG" to find the secton. + LCTRLFLAG: 0x0001, // Left Control flag + RCTRLFLAG: 0x0002, // Right Control flag + LALTFLAG: 0x0004, // Left Alt flag + RALTFLAG: 0x0008, // Right Alt flag + K_SHIFTFLAG: 0x0010, // Either shift flag + K_CTRLFLAG: 0x0020, // Either ctrl flag + K_ALTFLAG: 0x0040, // Either alt flag + K_METAFLAG: 0x0080, // Either Meta-key flag (tentative). Not usable in keyboard rules; + // Used internally (currently, only by KMW) to ensure Meta-key + // shortcuts safely bypass rules + // Meta key = Command key on macOS, Windows key on Windows/Linux + CAPITALFLAG: 0x0100, // Caps lock on + NOTCAPITALFLAG: 0x0200, // Caps lock NOT on + NUMLOCKFLAG: 0x0400, // Num lock on + NOTNUMLOCKFLAG: 0x0800, // Num lock NOT on + SCROLLFLAG: 0x1000, // Scroll lock on + NOTSCROLLFLAG: 0x2000, // Scroll lock NOT on + ISVIRTUALKEY: 0x4000, // It is a Virtual Key Sequence + VIRTUALCHARKEY: 0x8000, // Keyman 6.0: Virtual Key Cap Sequence NOT YET + + // Note: OTHER_MODIFIER = 0x10000, used by KMX+ for the + // other modifier flag in layers, > 16 bit so not available here. + // See keys_mod_other in keyman_core_ldml.ts +} diff --git a/common/web/types/src/consts/virtual-key-constants.ts b/common/web/types/src/consts/virtual-key-constants.ts index 3347660f01..7b083241bd 100644 --- a/common/web/types/src/consts/virtual-key-constants.ts +++ b/common/web/types/src/consts/virtual-key-constants.ts @@ -1,6 +1,5 @@ // Define standard keycode numbers (exposed for use by other modules) -// TODO-LDML: merge with common\web\keyboard-processor\src\text\codes.ts /** * May include non-US virtual key codes @@ -128,7 +127,7 @@ export const USVirtualKeyCodes = { 'k_?C1':193, K_oDF:0xDF, K_ODF:0xDF, - /*K_LOPT:50001, + K_LOPT:50001, K_ROPT:50002, K_NUMERALS:50003, K_SYMBOLS:50004, @@ -139,7 +138,7 @@ export const USVirtualKeyCodes = { K_SHIFTED:50009, K_ALTGR:50010, K_TABBACK:50011, - K_TABFWD:50012*/ + K_TABFWD:50012 }; const k = USVirtualKeyCodes; diff --git a/common/web/types/src/keyman-touch-layout/keyman-touch-layout-file.ts b/common/web/types/src/keyman-touch-layout/keyman-touch-layout-file.ts index 757316a70a..786d9213e2 100644 --- a/common/web/types/src/keyman-touch-layout/keyman-touch-layout-file.ts +++ b/common/web/types/src/keyman-touch-layout/keyman-touch-layout-file.ts @@ -58,7 +58,7 @@ export const PRIVATE_USE_IDS = [ ] as const; /* A map of key field names with values matching the `typeof` the corresponding property - * exists in common/web/keyboard-processor, keyboards/activeLayout.ts. + * exists in /web/src/engine/keyboard/src/keyboards/activeLayout.ts. * * Make sure that when one is updated, the other also is. TS types are compile-time only, * so the run-time-accessible mapping in activeLayout.ts cannot be auto-generated by TS. */ diff --git a/common/web/types/src/kmx/element-string.ts b/common/web/types/src/kmx/kmx-plus/element-string.ts similarity index 94% rename from common/web/types/src/kmx/element-string.ts rename to common/web/types/src/kmx/kmx-plus/element-string.ts index 1b24c3eb45..c7597b4f6b 100644 --- a/common/web/types/src/kmx/element-string.ts +++ b/common/web/types/src/kmx/kmx-plus/element-string.ts @@ -1,8 +1,9 @@ import { constants } from '@keymanapp/ldml-keyboard-constants'; import { DependencySections, StrsItem, UsetItem } from './kmx-plus.js'; -import { ElementParser, ElementSegment, ElementType } from '../ldml-keyboard/pattern-parser.js'; -import { MATCH_HEX_ESCAPE } from '../util/consts.js'; -import { unescapeOneQuadString } from '../util/util.js'; +import { ElementParser, ElementSegment, ElementType } from '../../ldml-keyboard/pattern-parser.js'; +import { util } from '@keymanapp/common-types'; +import MATCH_HEX_ESCAPE = util.MATCH_HEX_ESCAPE; +import unescapeOneQuadString = util.unescapeOneQuadString; export enum ElemElementFlags { none = 0, diff --git a/common/web/types/src/kmx/kmx-plus.ts b/common/web/types/src/kmx/kmx-plus/kmx-plus.ts similarity index 97% rename from common/web/types/src/kmx/kmx-plus.ts rename to common/web/types/src/kmx/kmx-plus/kmx-plus.ts index 6e3c73d33c..1d19cdd4d0 100644 --- a/common/web/types/src/kmx/kmx-plus.ts +++ b/common/web/types/src/kmx/kmx-plus/kmx-plus.ts @@ -1,12 +1,18 @@ import { constants } from '@keymanapp/ldml-keyboard-constants'; import * as r from 'restructure'; import { ElementString } from './element-string.js'; -import { ListItem } from './string-list.js'; -import { isOneChar, toOneChar, unescapeString, escapeStringForRegex } from '../util/util.js'; -import { KMXFile } from './kmx.js'; -import { UnicodeSetParser, UnicodeSet } from '@keymanapp/common-types'; -import { VariableParser } from '../ldml-keyboard/pattern-parser.js'; -import { MarkerParser } from '../ldml-keyboard/pattern-parser.js'; +import { ListItem } from '../../ldml-keyboard/string-list.js'; +import { util } from '@keymanapp/common-types'; +import { KMX } from '@keymanapp/common-types'; +import { UnicodeSetParser, UnicodeSet } from '../../ldml-keyboard/unicodeset-parser-api.js'; +import { VariableParser } from '../../ldml-keyboard/pattern-parser.js'; +import { MarkerParser } from '../../ldml-keyboard/pattern-parser.js'; + +import isOneChar = util.isOneChar; +import toOneChar = util.toOneChar; +import unescapeString = util.unescapeString; +import escapeStringForRegex = util.escapeStringForRegex; +import KMXFile = KMX.KMXFile; // Implementation of file structures from /core/src/ldml/C7043_ldml.md // Writer in kmx-builder.ts diff --git a/common/web/types/src/kmx/kmx.ts b/common/web/types/src/kmx/kmx.ts index 35c0c61c3d..4f53e29fde 100644 --- a/common/web/types/src/kmx/kmx.ts +++ b/common/web/types/src/kmx/kmx.ts @@ -1,4 +1,5 @@ import * as r from 'restructure'; +import { ModifierKeyConstants } from '../consts/modifier-key-constants.js'; /* Definitions from kmx_file.h. Must be kept in sync */ @@ -343,25 +344,25 @@ export class KMXFile { public static readonly HK_CTRL = 0x00020000; public static readonly HK_SHIFT = 0x00040000; - public static readonly LCTRLFLAG = 0x0001; // Left Control flag - public static readonly RCTRLFLAG = 0x0002; // Right Control flag - public static readonly LALTFLAG = 0x0004; // Left Alt flag - public static readonly RALTFLAG = 0x0008; // Right Alt flag - public static readonly K_SHIFTFLAG = 0x0010; // Either shift flag - public static readonly K_CTRLFLAG = 0x0020; // Either ctrl flag - public static readonly K_ALTFLAG = 0x0040; // Either alt flag + public static readonly LCTRLFLAG = ModifierKeyConstants.LCTRLFLAG; // Left Control flag + public static readonly RCTRLFLAG = ModifierKeyConstants.RCTRLFLAG; // Right Control flag + public static readonly LALTFLAG = ModifierKeyConstants.LALTFLAG; // Left Alt flag + public static readonly RALTFLAG = ModifierKeyConstants.RALTFLAG; // Right Alt flag + public static readonly K_SHIFTFLAG = ModifierKeyConstants.K_SHIFTFLAG; // Either shift flag + public static readonly K_CTRLFLAG = ModifierKeyConstants.K_CTRLFLAG; // Either ctrl flag + public static readonly K_ALTFLAG = ModifierKeyConstants.K_ALTFLAG; // Either alt flag //public static readonly K_METAFLAG = 0x0080; // Either Meta-key flag (tentative). Not usable in keyboard rules; // Used internally (currently, only by KMW) to ensure Meta-key // shortcuts safely bypass rules // Meta key = Command key on macOS, Windows key on Windows - public static readonly CAPITALFLAG = 0x0100; // Caps lock on - public static readonly NOTCAPITALFLAG = 0x0200; // Caps lock NOT on - public static readonly NUMLOCKFLAG = 0x0400; // Num lock on - public static readonly NOTNUMLOCKFLAG = 0x0800; // Num lock NOT on - public static readonly SCROLLFLAG = 0x1000; // Scroll lock on - public static readonly NOTSCROLLFLAG = 0x2000; // Scroll lock NOT on - public static readonly ISVIRTUALKEY = 0x4000; // It is a Virtual Key Sequence - public static readonly VIRTUALCHARKEY = 0x8000; // Keyman 6.0: Virtual Key Cap Sequence NOT YET + public static readonly CAPITALFLAG = ModifierKeyConstants.CAPITALFLAG; // Caps lock on + public static readonly NOTCAPITALFLAG = ModifierKeyConstants.NOTCAPITALFLAG; // Caps lock NOT on + public static readonly NUMLOCKFLAG = ModifierKeyConstants.NUMLOCKFLAG; // Num lock on + public static readonly NOTNUMLOCKFLAG = ModifierKeyConstants.NOTNUMLOCKFLAG; // Num lock NOT on + public static readonly SCROLLFLAG = ModifierKeyConstants.SCROLLFLAG; // Scroll lock on + public static readonly NOTSCROLLFLAG = ModifierKeyConstants.NOTSCROLLFLAG; // Scroll lock NOT on + public static readonly ISVIRTUALKEY = ModifierKeyConstants.ISVIRTUALKEY; // It is a Virtual Key Sequence + public static readonly VIRTUALCHARKEY = ModifierKeyConstants.VIRTUALCHARKEY; // Keyman 6.0: Virtual Key Cap Sequence NOT YET // Note: OTHER_MODIFIER = 0x10000, used by KMX+ for the // other modifier flag in layers, > 16 bit so not available here. diff --git a/common/web/types/src/kmx/string-list.ts b/common/web/types/src/ldml-keyboard/string-list.ts similarity index 94% rename from common/web/types/src/kmx/string-list.ts rename to common/web/types/src/ldml-keyboard/string-list.ts index f68e905369..5d11a5ca7c 100644 --- a/common/web/types/src/kmx/string-list.ts +++ b/common/web/types/src/ldml-keyboard/string-list.ts @@ -1,5 +1,5 @@ -import { OrderedStringList } from '../ldml-keyboard/pattern-parser.js'; -import { DependencySections, StrsItem, StrsOptions } from './kmx-plus.js'; +import { OrderedStringList } from './pattern-parser.js'; +import { DependencySections, StrsItem, StrsOptions } from '../kmx/kmx-plus/kmx-plus.js'; /** * A single entry in a ListItem. diff --git a/common/web/types/src/main.ts b/common/web/types/src/main.ts index 0ddee928c2..7e0dc2f7b2 100644 --- a/common/web/types/src/main.ts +++ b/common/web/types/src/main.ts @@ -1,53 +1,19 @@ export * as KMX from './kmx/kmx.js'; -export * as KMXPlus from './kmx/kmx-plus.js'; -export { default as KMXBuilder } from './kmx/kmx-builder.js'; export { KmxFileReader, KmxFileReaderError } from './kmx/kmx-file-reader.js'; export * as KeymanTargets from './kmx/keyman-targets.js'; export * as VisualKeyboard from './kvk/visual-keyboard.js'; -export { default as KMXPlusBuilder} from './kmx/kmx-plus-builder/kmx-plus-builder.js'; export { default as KvkFileReader } from './kvk/kvk-file-reader.js'; -export { default as KvksFileReader } from './kvk/kvks-file-reader.js'; export { default as KvkFileWriter } from './kvk/kvk-file-writer.js'; -export { default as KvksFileWriter } from './kvk/kvks-file-writer.js'; export * as KvkFile from './kvk/kvk-file.js'; -export * as KvksFile from './kvk/kvks-file.js'; -export * as LDMLKeyboard from './ldml-keyboard/ldml-keyboard-xml.js'; -export { LDMLKeyboardTestDataXMLSourceFile } from './ldml-keyboard/ldml-keyboard-testdata-xml.js'; -export { UnicodeSetParser, UnicodeSet } from './ldml-keyboard/unicodeset-parser-api.js'; -export { VariableParser, MarkerParser } from './ldml-keyboard/pattern-parser.js'; -export { LDMLKeyboardXMLSourceFileReader, LDMLKeyboardXMLSourceFileReaderOptions } from './ldml-keyboard/ldml-keyboard-xml-reader.js'; +export { USVirtualKeyCodes } from './consts/virtual-key-constants.js'; export * as Constants from './consts/virtual-key-constants.js'; - -export { defaultCompilerOptions, CompilerBaseOptions, CompilerCallbacks, CompilerOptions, CompilerEvent, CompilerErrorNamespace, - CompilerErrorSeverity, CompilerPathCallbacks, CompilerFileSystemCallbacks, CompilerCallbackOptions, - CompilerError, CompilerMessageSpec, CompilerMessageSpecWithException, compilerErrorSeverity, CompilerErrorMask, CompilerFileCallbacks, compilerErrorSeverityName, - compilerErrorFormatCode, CompilerMessageDef, - compilerLogLevelToSeverity, CompilerLogLevel, compilerEventFormat, ALL_COMPILER_LOG_LEVELS, - ALL_COMPILER_LOG_FORMATS, CompilerLogFormat, - CompilerMessageOverride, - CompilerMessageOverrideMap, - - KeymanCompilerArtifact, - KeymanCompilerArtifactOptional, - KeymanCompilerArtifacts, - KeymanCompilerResult, - KeymanCompiler - - } from './util/compiler-interfaces.js'; -export { CommonTypesMessages } from './util/common-events.js'; +export { ModifierKeyConstants } from './consts/modifier-key-constants.js'; export * as TouchLayout from './keyman-touch-layout/keyman-touch-layout-file.js'; -export { TouchLayoutFileReader } from './keyman-touch-layout/keyman-touch-layout-file-reader.js'; -export { TouchLayoutFileWriter, TouchLayoutFileWriterOptions } from './keyman-touch-layout/keyman-touch-layout-file-writer.js'; -export * as KPJ from './kpj/kpj-file.js'; -export { KPJFileReader } from './kpj/kpj-file-reader.js'; -export { KeymanDeveloperProject, KeymanDeveloperProjectFile, KeymanDeveloperProjectType, } from './kpj/keyman-developer-project.js'; - -export * as KpsFile from './package/kps-file.js'; export * as KmpJsonFile from './package/kmp-json-file.js'; export { Uni_IsSurrogate1, Uni_IsSurrogate2 } from './util/util.js'; @@ -58,4 +24,8 @@ export * as KeymanFileTypes from './util/file-types.js'; export * as Schemas from './schemas.js'; export * as SchemaValidators from './schema-validators.js'; -export * as xml2js from './deps/xml2js/xml2js.js'; \ No newline at end of file +export * as KMXPlus from './kmx/kmx-plus/kmx-plus.js'; +// TODO: these exports are really not well named +export { UnicodeSetParser, UnicodeSet } from './ldml-keyboard/unicodeset-parser-api.js'; +export { VariableParser, MarkerParser } from './ldml-keyboard/pattern-parser.js'; +export { ElementString } from './kmx/kmx-plus/element-string.js'; diff --git a/common/web/types/test/helpers/index.ts b/common/web/types/test/helpers/index.ts index 9b2be1d605..3e305eeca8 100644 --- a/common/web/types/test/helpers/index.ts +++ b/common/web/types/test/helpers/index.ts @@ -1,5 +1,4 @@ import * as path from "path"; -import * as fs from "fs"; import { fileURLToPath } from "url"; /** @@ -12,26 +11,3 @@ import { fileURLToPath } from "url"; export function makePathToFixture(...components: string[]): string { return fileURLToPath(new URL(path.join('..', '..', '..', 'test', 'fixtures', ...components), import.meta.url)); } - -export function loadFile(filename: string | URL): Buffer { - return fs.readFileSync(filename); -} - -export function resolveFilename(baseFilename: string, filename: string) { - const basePath = - baseFilename.endsWith('/') || baseFilename.endsWith('\\') ? - baseFilename : - path.dirname(baseFilename); - // Transform separators to platform separators -- we are agnostic - // in our use here but path prefers files may use - // either / or \, although older kps files were always \. - if(path.sep == '/') { - filename = filename.replace(/\\/g, '/'); - } else { - filename = filename.replace(/\//g, '\\'); - } - if(!path.isAbsolute(filename)) { - filename = path.resolve(basePath, filename); - } - return filename; -} diff --git a/common/web/types/tsconfig.json b/common/web/types/tsconfig.json index 0473ae92ee..cd779632a0 100644 --- a/common/web/types/tsconfig.json +++ b/common/web/types/tsconfig.json @@ -9,7 +9,6 @@ "preserveConstEnums": true, }, "include": [ - "src/deps/xml2js/*.js", "src/**/*.ts", "src/schemas/*.mjs", // Import the validators ], diff --git a/core/cross-mac-arm64.build b/core/cross-mac-arm64.build index 720e9f3100..faf3e6e9c1 100644 --- a/core/cross-mac-arm64.build +++ b/core/cross-mac-arm64.build @@ -5,9 +5,9 @@ cpu = 'arm64' endian = 'little' [binaries] -c = ['clang', '-arch', 'arm64'] -objc = ['clang', '-arch', 'arm64'] -cpp = ['clang++', '-arch', 'arm64'] +c = ['clang', '-arch', 'arm64', '-mmacosx-version-min=10.13'] +objc = ['clang', '-arch', 'arm64', '-mmacosx-version-min=10.13'] +cpp = ['clang++', '-arch', 'arm64', '-mmacosx-version-min=10.13'] ar = 'ar' ld = 'ld' strip = 'strip' diff --git a/core/cross-mac-x86_64.build b/core/cross-mac-x86_64.build index 2ab2c62a60..3378fe11a4 100644 --- a/core/cross-mac-x86_64.build +++ b/core/cross-mac-x86_64.build @@ -5,9 +5,9 @@ cpu = 'x86_64' endian = 'little' [binaries] -c = ['clang', '-arch', 'x86_64'] -objc = ['clang', '-arch', 'x86_64'] -cpp = ['clang++', '-arch', 'x86_64'] +c = ['clang', '-arch', 'x86_64', '-mmacosx-version-min=10.13'] +objc = ['clang', '-arch', 'x86_64', '-mmacosx-version-min=10.13'] +cpp = ['clang++', '-arch', 'x86_64', '-mmacosx-version-min=10.13'] ar = 'ar' ld = 'ld' strip = 'strip' diff --git a/core/doc/meson.build b/core/doc/meson.build index 6039e2e2dd..a0f2bc4e6d 100644 --- a/core/doc/meson.build +++ b/core/doc/meson.build @@ -20,7 +20,7 @@ if hotdoc.found() deps = files( '../include/keyman/keyman_core_api.h', '../src/jsonpp.hpp', - '../src/utfcodec.hpp' + '../../common/cpp/utfcodec.hpp' ) docs = custom_target('docs', diff --git a/core/src/meson.build b/core/src/meson.build index 212b56f1c2..41c198543c 100644 --- a/core/src/meson.build +++ b/core/src/meson.build @@ -126,7 +126,7 @@ core_files = files( 'keyboard.cpp', 'state.cpp', 'jsonpp.cpp', - 'utfcodec.cpp', + '../../common/cpp/utfcodec.cpp', ) mock_files = files( diff --git a/core/tests/meson.build b/core/tests/meson.build index 84c17d4220..90e0ab2a54 100644 --- a/core/tests/meson.build +++ b/core/tests/meson.build @@ -10,7 +10,10 @@ cmpfiles = ['-c', 'import sys; a = open(sys.argv[1], \'r\').read(); b = open(sys.argv[2], \'r\').read(); exit(not (a==b))'] stnds = join_paths(meson.current_source_dir(), 'standards') -libsrc = include_directories(join_paths('../', 'src')) +libsrc = include_directories( + '../src', + '../../common/include' +) # kmx_test_source is required for linux builds, so always enable it even when we # disable all other tests diff --git a/core/tests/unit/utftest/meson.build b/core/tests/unit/utftest/meson.build index eff79c10b7..4ab6cb74ca 100644 --- a/core/tests/unit/utftest/meson.build +++ b/core/tests/unit/utftest/meson.build @@ -5,6 +5,6 @@ # e = executable('utftest', 'utftest.cpp', - objects: lib.extract_objects('utfcodec.cpp'), + objects: lib.extract_objects('../../common/cpp/utfcodec.cpp'), include_directories: [libsrc]) test('utftest', e) diff --git a/core/wasm.build.linux.in b/core/wasm.build.linux.in index d449dcf94a..27cb7ba68f 100644 --- a/core/wasm.build.linux.in +++ b/core/wasm.build.linux.in @@ -1,4 +1,4 @@ [binaries] -c = ['$EMSCRIPTEN_BASE/emcc.py'] -cpp = ['$EMSCRIPTEN_BASE/em++.py'] -ar = ['$EMSCRIPTEN_BASE/emar.py'] \ No newline at end of file +c = ['$EMSCRIPTEN_BASE/emcc'] +cpp = ['$EMSCRIPTEN_BASE/em++'] +ar = ['$EMSCRIPTEN_BASE/emar'] diff --git a/core/wasm.build.mac.in b/core/wasm.build.mac.in index d449dcf94a..27cb7ba68f 100644 --- a/core/wasm.build.mac.in +++ b/core/wasm.build.mac.in @@ -1,4 +1,4 @@ [binaries] -c = ['$EMSCRIPTEN_BASE/emcc.py'] -cpp = ['$EMSCRIPTEN_BASE/em++.py'] -ar = ['$EMSCRIPTEN_BASE/emar.py'] \ No newline at end of file +c = ['$EMSCRIPTEN_BASE/emcc'] +cpp = ['$EMSCRIPTEN_BASE/em++'] +ar = ['$EMSCRIPTEN_BASE/emar'] diff --git a/core/wasm.defs.build b/core/wasm.defs.build index 4a598a1e1c..f41af337a3 100644 --- a/core/wasm.defs.build +++ b/core/wasm.defs.build @@ -1,7 +1,7 @@ [binaries] -c = ['emcc.py'] -cpp = ['em++.py'] -ar = ['emar.py'] +c = ['emcc'] +cpp = ['em++'] +ar = ['emar'] exe_wrapper = 'node' [properties] diff --git a/crowdin.yml b/crowdin.yml index 3c95e40186..812cfa21c7 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -127,6 +127,7 @@ files: languages_mapping: osx_code: pt-PT: pt-PT.lproj + el-polyton: el.lproj - source: /mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/en.lproj/preferences.strings dest: /mac/app/preferences.strings @@ -134,6 +135,7 @@ files: languages_mapping: osx_code: pt-PT: pt-PT.lproj + el-polyton: el.lproj - source: /mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/en.lproj/KMInfoWindowController.strings dest: /mac/app/KMInfoWindowController.strings @@ -141,6 +143,7 @@ files: languages_mapping: osx_code: pt-PT: pt-PT.lproj + el-polyton: el.lproj - source: /mac/Keyman4MacIM/Keyman4MacIM/KMKeyboardHelpWindow/en.lproj/KMKeyboardHelpWindowController.strings dest: /mac/app/KMKeyboardHelpWindowController.strings @@ -148,6 +151,7 @@ files: languages_mapping: osx_code: pt-PT: pt-PT.lproj + el-polyton: el.lproj - source: /mac/Keyman4MacIM/Keyman4MacIM/en.lproj/Localizable.strings dest: /mac/app/Localizable.strings @@ -155,6 +159,7 @@ files: languages_mapping: osx_code: pt-PT: pt-PT.lproj + el-polyton: el.lproj - source: /mac/Keyman4MacIM/Keyman4MacIM/en.lproj/MainMenu.strings dest: /mac/app/MainMenu.strings @@ -162,6 +167,7 @@ files: languages_mapping: osx_code: pt-PT: pt-PT.lproj + el-polyton: el.lproj # crowdin parameters descriptions: diff --git a/developer/src/.build-builder b/developer/src/.build-builder new file mode 100644 index 0000000000..a06440b36f --- /dev/null +++ b/developer/src/.build-builder @@ -0,0 +1 @@ +The presence of this file tells CI that we can build Developer on mac and linux, as of 18.0. We will be able to remove this file in 19.0. diff --git a/developer/src/build.sh b/developer/src/build.sh index de7ab49171..b45dea38f5 100755 --- a/developer/src/build.sh +++ b/developer/src/build.sh @@ -42,11 +42,29 @@ builder_describe \ "--npm-publish+ For publish, do a npm publish, not npm pack (only for CI)" \ "--dry-run,-n+ Don't actually publish anything to external endpoints, just dry run" +builder_describe_platform \ + :ext win,delphi \ + :kmanalyze win \ + :kmdbrowserhost win,delphi \ + :kmdecomp win \ + :kmconvert win,delphi \ + :samples win \ + :server win \ + :setup win,delphi \ + :test win,delphi \ + :tike win,delphi \ + :inst win,delphi + +# TODO: in future :server could be built on other platforms, potentially, but it +# has addons that are Windows-specific currently + builder_parse "$@" #------------------------------------------------------------------------------------------------------------------- -source "$KEYMAN_ROOT/resources/build/win/environment.inc.sh" +if [[ $BUILDER_OS == win ]]; then + source "$KEYMAN_ROOT/resources/build/win/environment.inc.sh" +fi # # We want to do some checks before we head down the long publish path diff --git a/developer/src/common/build.sh b/developer/src/common/build.sh index 53358c80b0..b37c2bc948 100755 --- a/developer/src/common/build.sh +++ b/developer/src/common/build.sh @@ -11,5 +11,8 @@ builder_describe \ ":delphi Delphi components" \ ":web Web components" +builder_describe_platform \ + :delphi win,delphi + builder_parse "$@" builder_run_child_actions clean configure build test diff --git a/developer/src/common/web/test-helpers/build.sh b/developer/src/common/web/test-helpers/build.sh index 175bce6616..c1664cfddd 100755 --- a/developer/src/common/web/test-helpers/build.sh +++ b/developer/src/common/web/test-helpers/build.sh @@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" builder_describe "Keyman Developer unit test helpers" \ - "@/common/web/types" \ + "@/developer/src/common/web/utils" \ clean configure build test builder_describe_outputs \ diff --git a/developer/src/common/web/test-helpers/index.ts b/developer/src/common/web/test-helpers/index.ts index be9157f69c..93dfb89b2c 100644 --- a/developer/src/common/web/test-helpers/index.ts +++ b/developer/src/common/web/test-helpers/index.ts @@ -1,6 +1,6 @@ import * as fs from 'fs'; import * as path from 'path'; -import { CompilerEvent, CompilerCallbacks, CompilerPathCallbacks, CompilerFileSystemCallbacks, CompilerError } from '@keymanapp/common-types'; +import { CompilerEvent, CompilerCallbacks, CompilerPathCallbacks, CompilerFileSystemCallbacks, CompilerError } from '@keymanapp/developer-utils'; export { verifyCompilerMessagesObject } from './verifyCompilerMessagesObject.js'; /** diff --git a/developer/src/common/web/test-helpers/package.json b/developer/src/common/web/test-helpers/package.json index 5aa6ec301f..d541894830 100644 --- a/developer/src/common/web/test-helpers/package.json +++ b/developer/src/common/web/test-helpers/package.json @@ -17,6 +17,6 @@ }, "license": "MIT", "dependencies": { - "@keymanapp/common-types": "*" + "@keymanapp/developer-utils": "*" } } diff --git a/developer/src/common/web/test-helpers/verifyCompilerMessagesObject.ts b/developer/src/common/web/test-helpers/verifyCompilerMessagesObject.ts index e9ed7b45a7..7f0d9aee76 100644 --- a/developer/src/common/web/test-helpers/verifyCompilerMessagesObject.ts +++ b/developer/src/common/web/test-helpers/verifyCompilerMessagesObject.ts @@ -1,4 +1,4 @@ -import { CompilerError, CompilerErrorMask } from '@keymanapp/common-types'; +import { CompilerError, CompilerErrorMask } from '@keymanapp/developer-utils'; import {assert, expect} from 'chai'; // diff --git a/developer/src/common/web/utils/build.sh b/developer/src/common/web/utils/build.sh index e58d585c5d..8829765237 100755 --- a/developer/src/common/web/utils/build.sh +++ b/developer/src/common/web/utils/build.sh @@ -21,20 +21,42 @@ builder_describe "Build Keyman Developer web utility module" \ builder_describe_outputs \ configure /node_modules \ - build /developer/src/common/web/utils/build/index.js + build /developer/src/common/web/utils/build/src/index.js builder_parse "$@" #------------------------------------------------------------------------------------------------------------------- +function copy_cldr_imports() { + # Store CLDR imports + # load all versions that have a cldr_info.json + for CLDR_INFO_PATH in "$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/"*/cldr_info.json + do + # TODO-LDML: developer/src/inst/download.in.mak needs these also... + CLDR_PATH=$(dirname "$CLDR_INFO_PATH") + CLDR_VER=$(basename "$CLDR_PATH") + mkdir -p "$THIS_SCRIPT_PATH/build/src/import/$CLDR_VER" + # TODO-LDML: When these are copied, the DOCTYPE will break due to the wrong path. We don't use the DTD so it should be OK. + cp "$CLDR_INFO_PATH" "$CLDR_PATH/import/"*.xml "$THIS_SCRIPT_PATH/build/src/import/$CLDR_VER/" + done +} + +function do_build() { + copy_cldr_imports + tsc --build +} + builder_run_action clean rm -rf ./build/ builder_run_action configure verify_npm_setup -builder_run_action build tsc --build +builder_run_action build do_build if builder_start_action test; then eslint . tsc --build test - c8 --reporter=lcov --reporter=text --exclude-after-remap mocha + readonly C8_THRESHOLD=40 + c8 --reporter=lcov --reporter=text --exclude-after-remap --lines $C8_THRESHOLD --statements $C8_THRESHOLD --branches $C8_THRESHOLD --functions $C8_THRESHOLD mocha + builder_echo warning "Coverage thresholds are currently $C8_THRESHOLD%, which is lower than ideal." + builder_echo warning "Please increase threshold in build.sh as test coverage improves." builder_finish_action success test fi diff --git a/developer/src/common/web/utils/index.ts b/developer/src/common/web/utils/index.ts deleted file mode 100644 index 7a792af2a1..0000000000 --- a/developer/src/common/web/utils/index.ts +++ /dev/null @@ -1,6 +0,0 @@ -export { validateMITLicense } from './src/validate-mit-license.js'; -export { KeymanSentry, SentryNodeOptions } from './src/KeymanSentry.js'; -export { getOption, loadOptions, clearOptions } from './src/options.js'; -export { escapeMarkdownChar } from './src/markdown.js'; -export { KeymanUrls } from './src/keyman-urls.js'; -export { isValidEmail } from './src/is-valid-email.js'; \ No newline at end of file diff --git a/developer/src/common/web/utils/package.json b/developer/src/common/web/utils/package.json index b93cca8efa..1ab9daddbf 100644 --- a/developer/src/common/web/utils/package.json +++ b/developer/src/common/web/utils/package.json @@ -3,19 +3,29 @@ "description": "Keyman Developer utilities", "type": "module", "exports": { - ".": "./build/index.js" + ".": "./build/src/index.js" }, "files": [ "/build/" ], "dependencies": { - "@sentry/node": "^7.57.0" + "@sentry/node": "^7.57.0", + "@keymanapp/common-types": "*", + "eventemitter3": "^5.0.0", + "restructure": "^3.0.1", + "semver": "^7.5.4", + "sax": ">=0.6.0", + "xmlbuilder": "~11.0.0" }, "devDependencies": { + "@types/git-diff": "^2.0.3", "@types/node": "^20.4.1", - "typescript": "^5.4.5", + "@types/semver": "^7.3.12", + "@types/xml2js": "^0.4.5", "c8": "^7.12.0", - "mocha": "^8.4.0" + "git-diff": "^2.0.6", + "mocha": "^8.4.0", + "typescript": "^5.4.5" }, "scripts": { "build": "tsc -b" diff --git a/common/web/types/src/util/common-events.ts b/developer/src/common/web/utils/src/common-events.ts similarity index 100% rename from common/web/types/src/util/common-events.ts rename to developer/src/common/web/utils/src/common-events.ts diff --git a/common/web/types/src/util/compiler-interfaces.ts b/developer/src/common/web/utils/src/compiler-interfaces.ts similarity index 99% rename from common/web/types/src/util/compiler-interfaces.ts rename to developer/src/common/web/utils/src/compiler-interfaces.ts index df8ab48f33..e4ed62d750 100644 --- a/common/web/types/src/util/compiler-interfaces.ts +++ b/developer/src/common/web/utils/src/compiler-interfaces.ts @@ -181,7 +181,7 @@ export class CompilerError { */ static severityNameToValue(name: string): CompilerErrorSeverity { name = name.toLowerCase(); - for(let level of CompilerErrorSeverityValues) { + for(const level of CompilerErrorSeverityValues) { if(errorSeverityName[level].startsWith(name)) { return level; } diff --git a/common/web/types/src/deps/xml2js/LICENSE b/developer/src/common/web/utils/src/deps/xml2js/LICENSE similarity index 100% rename from common/web/types/src/deps/xml2js/LICENSE rename to developer/src/common/web/utils/src/deps/xml2js/LICENSE diff --git a/common/web/types/src/deps/xml2js/README.md b/developer/src/common/web/utils/src/deps/xml2js/README.md similarity index 100% rename from common/web/types/src/deps/xml2js/README.md rename to developer/src/common/web/utils/src/deps/xml2js/README.md diff --git a/common/web/types/src/deps/xml2js/bom.js b/developer/src/common/web/utils/src/deps/xml2js/bom.js similarity index 100% rename from common/web/types/src/deps/xml2js/bom.js rename to developer/src/common/web/utils/src/deps/xml2js/bom.js diff --git a/common/web/types/src/deps/xml2js/builder.js b/developer/src/common/web/utils/src/deps/xml2js/builder.js similarity index 100% rename from common/web/types/src/deps/xml2js/builder.js rename to developer/src/common/web/utils/src/deps/xml2js/builder.js diff --git a/common/web/types/src/deps/xml2js/defaults.js b/developer/src/common/web/utils/src/deps/xml2js/defaults.js similarity index 100% rename from common/web/types/src/deps/xml2js/defaults.js rename to developer/src/common/web/utils/src/deps/xml2js/defaults.js diff --git a/common/web/types/src/deps/xml2js/parser.js b/developer/src/common/web/utils/src/deps/xml2js/parser.js similarity index 100% rename from common/web/types/src/deps/xml2js/parser.js rename to developer/src/common/web/utils/src/deps/xml2js/parser.js diff --git a/common/web/types/src/deps/xml2js/processors.js b/developer/src/common/web/utils/src/deps/xml2js/processors.js similarity index 100% rename from common/web/types/src/deps/xml2js/processors.js rename to developer/src/common/web/utils/src/deps/xml2js/processors.js diff --git a/common/web/types/src/deps/xml2js/xml2js.js b/developer/src/common/web/utils/src/deps/xml2js/xml2js.js similarity index 100% rename from common/web/types/src/deps/xml2js/xml2js.js rename to developer/src/common/web/utils/src/deps/xml2js/xml2js.js diff --git a/developer/src/common/web/utils/src/index.ts b/developer/src/common/web/utils/src/index.ts new file mode 100644 index 0000000000..0e462c7c05 --- /dev/null +++ b/developer/src/common/web/utils/src/index.ts @@ -0,0 +1,47 @@ +export { validateMITLicense } from './utils/validate-mit-license.js'; +export { KeymanSentry, SentryNodeOptions } from './utils/KeymanSentry.js'; +export { getOption, loadOptions, clearOptions } from './utils/options.js'; +export { escapeMarkdownChar } from './utils/markdown.js'; +export { KeymanUrls } from './utils/keyman-urls.js'; + +export * as KPJ from './types/kpj/kpj-file.js'; +export { KPJFileReader } from './types/kpj/kpj-file-reader.js'; +export { KeymanDeveloperProject, KeymanDeveloperProjectFile, KeymanDeveloperProjectType, } from './types/kpj/keyman-developer-project.js'; +export { isValidEmail } from './is-valid-email.js'; + +export * as KpsFile from './types/kps/kps-file.js'; + +export { default as KvksFileReader } from './types/kvks/kvks-file-reader.js'; +export { default as KvksFileWriter } from './types/kvks/kvks-file-writer.js'; +export * as KvksFile from './types/kvks/kvks-file.js'; + +export { TouchLayoutFileReader } from './types/keyman-touch-layout/keyman-touch-layout-file-reader.js'; +export { TouchLayoutFileWriter, TouchLayoutFileWriterOptions } from './types/keyman-touch-layout/keyman-touch-layout-file-writer.js'; + +export { default as KMXBuilder } from './types/kmx/kmx-builder.js'; +export { default as KMXPlusBuilder} from './types/kmx/kmx-plus-builder/kmx-plus-builder.js'; + +export * as LDMLKeyboard from './types/ldml-keyboard/ldml-keyboard-xml.js'; +export { LDMLKeyboardTestDataXMLSourceFile } from './types/ldml-keyboard/ldml-keyboard-testdata-xml.js'; +export { LDMLKeyboardXMLSourceFileReader, LDMLKeyboardXMLSourceFileReaderOptions } from './types/ldml-keyboard/ldml-keyboard-xml-reader.js'; + +export { defaultCompilerOptions, CompilerBaseOptions, CompilerCallbacks, CompilerOptions, CompilerEvent, CompilerErrorNamespace, + CompilerErrorSeverity, CompilerPathCallbacks, CompilerFileSystemCallbacks, CompilerCallbackOptions, + CompilerError, CompilerMessageSpec, CompilerMessageSpecWithException, compilerErrorSeverity, CompilerErrorMask, CompilerFileCallbacks, compilerErrorSeverityName, + compilerErrorFormatCode, CompilerMessageDef, + compilerLogLevelToSeverity, CompilerLogLevel, compilerEventFormat, ALL_COMPILER_LOG_LEVELS, + ALL_COMPILER_LOG_FORMATS, CompilerLogFormat, + CompilerMessageOverride, + CompilerMessageOverrideMap, + + KeymanCompilerArtifact, + KeymanCompilerArtifactOptional, + KeymanCompilerArtifacts, + KeymanCompilerResult, + KeymanCompiler + + } from './compiler-interfaces.js'; + +export { CommonTypesMessages } from './common-events.js'; + +export * as xml2js from './deps/xml2js/xml2js.js'; diff --git a/developer/src/common/web/utils/src/restructure.d.ts b/developer/src/common/web/utils/src/restructure.d.ts new file mode 100644 index 0000000000..9750d24473 --- /dev/null +++ b/developer/src/common/web/utils/src/restructure.d.ts @@ -0,0 +1,2 @@ +// TODO: consider defining more types? +declare module 'restructure'; \ No newline at end of file diff --git a/common/web/types/src/keyman-touch-layout/keyman-touch-layout-file-reader.ts b/developer/src/common/web/utils/src/types/keyman-touch-layout/keyman-touch-layout-file-reader.ts similarity index 82% rename from common/web/types/src/keyman-touch-layout/keyman-touch-layout-file-reader.ts rename to developer/src/common/web/utils/src/types/keyman-touch-layout/keyman-touch-layout-file-reader.ts index e0f4ea7917..81be30e387 100644 --- a/common/web/types/src/keyman-touch-layout/keyman-touch-layout-file-reader.ts +++ b/developer/src/common/web/utils/src/types/keyman-touch-layout/keyman-touch-layout-file-reader.ts @@ -1,5 +1,6 @@ -import { TouchLayoutFile } from "./keyman-touch-layout-file.js"; -import SchemaValidators from '../schema-validators.js'; +import { TouchLayout } from "@keymanapp/common-types"; +import TouchLayoutFile = TouchLayout.TouchLayoutFile; +import { SchemaValidators } from '@keymanapp/common-types'; export class TouchLayoutFileReader { public read(source: Uint8Array): TouchLayoutFile { @@ -22,7 +23,7 @@ export class TouchLayoutFileReader { // `row.id` should be number, but may have been stringified; we use // presence of `key` property to recognise this as a `TouchLayoutRow`. if(this.key && key == 'id' && typeof value == 'string') { - let newValue = parseInt(value, 10); + const newValue = parseInt(value, 10); /* c8 ignore next 3 */ if(isNaN(newValue)) { throw new TypeError(`Invalid row.id: "${value}"`); @@ -39,7 +40,7 @@ export class TouchLayoutFileReader { return undefined; } - let newValue = parseInt(value, 10); + const newValue = parseInt(value, 10); /* c8 ignore next 3 */ if(isNaN(newValue)) { throw new TypeError(`Invalid [sub]key.${key}: "${value}"`); @@ -67,10 +68,10 @@ export class TouchLayoutFileReader { } public validate(source: TouchLayoutFile): void { - if(!SchemaValidators.touchLayoutClean(source)) + if(!SchemaValidators.default.touchLayoutClean(source)) /* c8 ignore next 3 */ { - throw new Error(JSON.stringify((SchemaValidators.touchLayoutClean).errors)); + throw new Error(JSON.stringify((SchemaValidators.default.touchLayoutClean).errors)); } } diff --git a/common/web/types/src/keyman-touch-layout/keyman-touch-layout-file-writer.ts b/developer/src/common/web/utils/src/types/keyman-touch-layout/keyman-touch-layout-file-writer.ts similarity index 86% rename from common/web/types/src/keyman-touch-layout/keyman-touch-layout-file-writer.ts rename to developer/src/common/web/utils/src/types/keyman-touch-layout/keyman-touch-layout-file-writer.ts index 5de702eb1c..6261f80d4b 100644 --- a/common/web/types/src/keyman-touch-layout/keyman-touch-layout-file-writer.ts +++ b/developer/src/common/web/utils/src/types/keyman-touch-layout/keyman-touch-layout-file-writer.ts @@ -1,4 +1,8 @@ -import { TouchLayoutFile, TouchLayoutPlatform, TouchLayoutKey, TouchLayoutSubKey } from "./keyman-touch-layout-file.js"; +import { TouchLayout } from "@keymanapp/common-types"; +import TouchLayoutFile = TouchLayout.TouchLayoutFile; +import TouchLayoutPlatform = TouchLayout.TouchLayoutPlatform;; +import TouchLayoutKey = TouchLayout.TouchLayoutKey; +import TouchLayoutSubKey = TouchLayout.TouchLayoutSubKey; export interface TouchLayoutFileWriterOptions { formatted?: boolean; @@ -87,24 +91,24 @@ export class TouchLayoutFileWriter { // displayUnderlying is always written out by kmcomp, so we do the same for kmc: platform.displayUnderlying = !!platform.displayUnderlying; - for(let layer of platform.layer) { - for(let row of layer.row) { + for(const layer of platform.layer) { + for(const row of layer.row) { // this matches the old spec for touch layout files (row.id as any) = row.id.toString(); - for(let key of row.key) { + for(const key of row.key) { fixupKey(key); if(key.sk) { - for(let sk of key.sk) { + for(const sk of key.sk) { fixupKey(sk); } } if(key.multitap) { - for(let sk of key.multitap) { + for(const sk of key.multitap) { fixupKey(sk); } } if(key.flick) { - for(let id of Object.keys(key.flick)) { + for(const id of Object.keys(key.flick)) { fixupKey((key.flick as any)[id] as TouchLayoutSubKey); } } diff --git a/common/web/types/src/kmx/kmx-builder.ts b/developer/src/common/web/utils/src/types/kmx/kmx-builder.ts similarity index 85% rename from common/web/types/src/kmx/kmx-builder.ts rename to developer/src/common/web/utils/src/types/kmx/kmx-builder.ts index 4a319bfe45..a8ce169d30 100644 --- a/common/web/types/src/kmx/kmx-builder.ts +++ b/developer/src/common/web/utils/src/types/kmx/kmx-builder.ts @@ -1,8 +1,18 @@ +import { KMXPlus, KMX } from '@keymanapp/common-types'; import * as r from 'restructure'; -import { KMXFile, GROUP, KEY, STORE, BUILDER_COMP_KEYBOARD, BUILDER_COMP_KEYBOARD_KMXPLUSINFO, BUILDER_COMP_STORE, BUILDER_COMP_GROUP, BUILDER_COMP_KEY } from './kmx.js'; -import { KMXPlusFile } from './kmx-plus.js'; import KMXPlusBuilder from './kmx-plus-builder/kmx-plus-builder.js'; +import KMXPlusFile = KMXPlus.KMXPlusFile; +import KMXFile = KMX.KMXFile; +import GROUP = KMX.GROUP; +import KEY = KMX.KEY; +import STORE = KMX.STORE; +import BUILDER_COMP_KEYBOARD = KMX.BUILDER_COMP_KEYBOARD; +import BUILDER_COMP_KEYBOARD_KMXPLUSINFO = KMX.BUILDER_COMP_KEYBOARD_KMXPLUSINFO; +import BUILDER_COMP_STORE = KMX.BUILDER_COMP_STORE; +import BUILDER_COMP_GROUP = KMX.BUILDER_COMP_GROUP; +import BUILDER_COMP_KEY = KMX.BUILDER_COMP_KEY; + export default class KMXBuilder { file: KMXFile; base_keyboard: number = 0; @@ -69,8 +79,8 @@ export default class KMXBuilder { this.comp_header.dpStoreArray = this.comp_header.cxStoreArray ? size : 0; let storeBase = size; size += this.file.keyboard.stores.length * KMXFile.COMP_STORE_SIZE; - for(let store of this.file.keyboard.stores) { - let comp_store: BUILDER_COMP_STORE = { + for(const store of this.file.keyboard.stores) { + const comp_store: BUILDER_COMP_STORE = { dwSystemID: store.dwSystemID, dpName: 0, dpString: 0 @@ -90,8 +100,8 @@ export default class KMXBuilder { this.comp_header.dpGroupArray = this.comp_header.cxGroupArray ? size : 0; let groupBase = size; size += this.file.keyboard.groups.length * KMXFile.COMP_GROUP_SIZE; - for(let group of this.file.keyboard.groups) { - let comp_group: BUILDER_COMP_GROUP = { + for(const group of this.file.keyboard.groups) { + const comp_group: BUILDER_COMP_GROUP = { dpName: 0, dpKeyArray: 0, dpMatch: 0, @@ -100,7 +110,7 @@ export default class KMXBuilder { fUsingKeys: group.fUsingKeys ? 1 : 0 }; - let comp_keys: {base: number, key: KEY, obj: BUILDER_COMP_KEY}[] = []; + const comp_keys: {base: number, key: KEY, obj: BUILDER_COMP_KEY}[] = []; this.comp_groups.push({base: groupBase, group: group, obj: comp_group, keys: comp_keys}); @@ -116,8 +126,8 @@ export default class KMXBuilder { let keyBase = size; size += group.keys.length * KMXFile.COMP_KEY_SIZE; - for(let key of group.keys) { - let comp_key: BUILDER_COMP_KEY = { + for(const key of group.keys) { + const comp_key: BUILDER_COMP_KEY = { Key: key.Key, _padding: 0, Line: key.Line, @@ -164,11 +174,11 @@ export default class KMXBuilder { if(requireString && !str.length) { // Just write zero terminator, as r.String for a zero-length string // seems to fail. - let sbuf = r.uint16le; + const sbuf = r.uint16le; file.set(sbuf.toBuffer(0), pos); } else if(pos && str.length) { - let sbuf = new r.String(null, 'utf16le'); // null-terminated string + const sbuf = new r.String(null, 'utf16le'); // null-terminated string file.set(sbuf.toBuffer(str), pos); } } @@ -176,7 +186,7 @@ export default class KMXBuilder { compile(): Uint8Array { const fileSize = this.build(); - let file: Uint8Array = new Uint8Array(fileSize); + const file: Uint8Array = new Uint8Array(fileSize); // Write headers @@ -190,7 +200,7 @@ export default class KMXBuilder { // Write store array and data - for(let store of this.comp_stores) { + for(const store of this.comp_stores) { file.set(this.file.COMP_STORE.toBuffer(store.obj), store.base); if(this.writeDebug) { this.setString(file, store.obj.dpName, store.store.dpName); @@ -200,7 +210,7 @@ export default class KMXBuilder { // Write group array and data - for(let group of this.comp_groups) { + for(const group of this.comp_groups) { file.set(this.file.COMP_GROUP.toBuffer(group.obj), group.base); if(this.writeDebug) { this.setString(file, group.obj.dpName, group.group.dpName); @@ -208,7 +218,7 @@ export default class KMXBuilder { this.setString(file, group.obj.dpMatch, group.group.dpMatch); this.setString(file, group.obj.dpNoMatch, group.group.dpNoMatch); - for(let key of group.keys) { + for(const key of group.keys) { file.set(this.file.COMP_KEY.toBuffer(key.obj), key.base); // for back-compat reasons, these are never NULL strings this.setString(file, key.obj.dpContext, key.key.dpContext, true); diff --git a/common/web/types/src/kmx/kmx-plus-builder/build-disp.ts b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-disp.ts similarity index 88% rename from common/web/types/src/kmx/kmx-plus-builder/build-disp.ts rename to developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-disp.ts index 712dafac27..6984aa2cfa 100644 --- a/common/web/types/src/kmx/kmx-plus-builder/build-disp.ts +++ b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-disp.ts @@ -1,8 +1,10 @@ import { constants } from '@keymanapp/ldml-keyboard-constants'; -import { KMXPlusData } from "../kmx-plus.js"; +import { KMXPlus } from "@keymanapp/common-types"; import { build_strs_index, BUILDER_STR_REF, BUILDER_STRS } from "./build-strs.js"; import { BUILDER_SECTION } from './builder-section.js'; +import KMXPlusData = KMXPlus.KMXPlusData; + /* ------------------------------------------------------------------ * disp section ------------------------------------------------------------------ */ @@ -27,7 +29,7 @@ export function build_disp(kmxplus: KMXPlusData, sect_strs: BUILDER_STRS): BUILD return null; } - let disp: BUILDER_DISP = { + const disp: BUILDER_DISP = { ident: constants.hex_section_id(constants.section.disp), size: constants.length_disp + constants.length_disp_item * kmxplus.disp.disps.length, _offset: 0, @@ -36,7 +38,7 @@ export function build_disp(kmxplus: KMXPlusData, sect_strs: BUILDER_STRS): BUILD items: [] }; - for(let item of kmxplus.disp.disps) { + for(const item of kmxplus.disp.disps) { disp.items.push({ to: build_strs_index(sect_strs, item.to), id: build_strs_index(sect_strs, item.id), diff --git a/common/web/types/src/kmx/kmx-plus-builder/build-elem.ts b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-elem.ts similarity index 94% rename from common/web/types/src/kmx/kmx-plus-builder/build-elem.ts rename to developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-elem.ts index 8e325f9591..8dafccced2 100644 --- a/common/web/types/src/kmx/kmx-plus-builder/build-elem.ts +++ b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-elem.ts @@ -1,10 +1,11 @@ import { constants } from "@keymanapp/ldml-keyboard-constants"; -import { ElementString } from "../element-string.js"; -import { Elem } from "../kmx-plus.js"; +import { KMXPlus, ElementString } from "@keymanapp/common-types"; import { build_strs_index, BUILDER_STR_REF, BUILDER_STRS } from "./build-strs.js"; import { BUILDER_SECTION, BUILDER_U32CHAR } from "./builder-section.js"; import { build_uset_index, BUILDER_USET, BUILDER_USET_REF } from "./build-uset.js"; +import Elem = KMXPlus.Elem; + /* ------------------------------------------------------------------ * elem section ------------------------------------------------------------------ */ @@ -46,7 +47,7 @@ function binaryElemCompare(a: BUILDER_ELEM_STRING, b: BUILDER_ELEM_STRING): numb } export function build_elem(source_elem: Elem, sect_strs: BUILDER_STRS, sect_uset: BUILDER_USET): BUILDER_ELEM { - let result: BUILDER_ELEM = { + const result: BUILDER_ELEM = { ident: constants.hex_section_id(constants.section.elem), size: 0, // finalized below _offset: 0, @@ -55,7 +56,7 @@ export function build_elem(source_elem: Elem, sect_strs: BUILDER_STRS, sect_uset }; result.strings = source_elem.strings.map(item => { - let res: BUILDER_ELEM_STRING = { + const res: BUILDER_ELEM_STRING = { offset: 0, // finalized below length: item.length, items: [], @@ -87,7 +88,7 @@ export function build_elem(source_elem: Elem, sect_strs: BUILDER_STRS, sect_uset /* Calculate offsets and total size */ let offset = constants.length_elem + constants.length_elem_item * result.count; - for(let item of result.strings) { + for(const item of result.strings) { if (item.length === 0) { // no length gets a zero offset item.offset = 0; diff --git a/common/web/types/src/kmx/kmx-plus-builder/build-keys.ts b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-keys.ts similarity index 93% rename from common/web/types/src/kmx/kmx-plus-builder/build-keys.ts rename to developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-keys.ts index ec7e505c57..fd48ec49ec 100644 --- a/common/web/types/src/kmx/kmx-plus-builder/build-keys.ts +++ b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-keys.ts @@ -1,10 +1,14 @@ import { constants } from "@keymanapp/ldml-keyboard-constants"; -import { KeysFlick, KMXPlusData, StrsItem } from "../kmx-plus.js"; +import { KMXPlus } from "@keymanapp/common-types"; import { build_strs_index, BUILDER_STR_REF, BUILDER_STRS } from "./build-strs.js"; import { build_list_index, BUILDER_LIST, BUILDER_LIST_REF } from "./build-list.js"; import { BUILDER_SECTION, BUILDER_U32CHAR } from "./builder-section.js"; +import KeysFlick = KMXPlus.KeysFlick; +import KMXPlusData = KMXPlus.KMXPlusData; +import StrsItem = KMXPlus.StrsItem; + /* ------------------------------------------------------------------ * keys section ------------------------------------------------------------------ */ @@ -71,7 +75,7 @@ export function build_keys(kmxplus: KMXPlusData, sect_strs: BUILDER_STRS, sect_l return null; } - let keys: BUILDER_KEYS = { + const keys: BUILDER_KEYS = { ident: constants.hex_section_id(constants.section.keys), size: 0, keyCount: kmxplus.keys.keys.length, @@ -89,7 +93,7 @@ export function build_keys(kmxplus: KMXPlusData, sect_strs: BUILDER_STRS, sect_l // Note that per the Keys class and spec, there is always a flicks=0 meaning 'no flicks' keys.flicks = kmxplus.keys.flicks.map((flicks) => { - let result : BUILDER_KEYS_FLICKS = { + const result : BUILDER_KEYS_FLICKS = { count: flicks.flicks.length, flick: keys.flick.length, // index of first flick id: build_strs_index(sect_strs, flicks.id), @@ -113,7 +117,7 @@ export function build_keys(kmxplus: KMXPlusData, sect_strs: BUILDER_STRS, sect_l // now, keys keys.keys = kmxplus.keys.keys.map((key) => { - let result : BUILDER_KEYS_KEY = { + const result : BUILDER_KEYS_KEY = { to: build_strs_index(sect_strs, key.to), flags: key.flags, id: build_strs_index(sect_strs, key.id), @@ -136,7 +140,7 @@ export function build_keys(kmxplus: KMXPlusData, sect_strs: BUILDER_STRS, sect_l // finally, kmap keys.kmap = kmxplus.keys.kmap.map(({vkey, mod, key}) => { - let result : BUILDER_KEYS_KMAP = { + const result : BUILDER_KEYS_KMAP = { vkey, mod, key: keys.keys.findIndex(k => k._id === key), @@ -160,7 +164,7 @@ export function build_keys(kmxplus: KMXPlusData, sect_strs: BUILDER_STRS, sect_l return rc; }); - let offset = constants.length_keys + + const offset = constants.length_keys + (constants.length_keys_key * keys.keyCount) + (constants.length_keys_flick_element * keys.flickCount) + (constants.length_keys_flick_list * keys.flicksCount) + diff --git a/common/web/types/src/kmx/kmx-plus-builder/build-layr.ts b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-layr.ts similarity index 94% rename from common/web/types/src/kmx/kmx-plus-builder/build-layr.ts rename to developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-layr.ts index c0038246e2..07249368f4 100644 --- a/common/web/types/src/kmx/kmx-plus-builder/build-layr.ts +++ b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-layr.ts @@ -1,10 +1,15 @@ import { constants } from "@keymanapp/ldml-keyboard-constants"; -import { KMXPlusData, LayrEntry, LayrRow, StrsItem } from "../kmx-plus.js"; +import { KMXPlus } from "@keymanapp/common-types"; import { build_strs_index, BUILDER_STR_REF, BUILDER_STRS } from "./build-strs.js"; import { BUILDER_LIST } from "./build-list.js"; import { BUILDER_SECTION } from "./builder-section.js"; +import KMXPlusData = KMXPlus.KMXPlusData; +import LayrEntry = KMXPlus.LayrEntry; +import LayrRow = KMXPlus.LayrRow; +import StrsItem = KMXPlus.StrsItem; + /* ------------------------------------------------------------------ * layr section - ------------------------------------------------------------------ */ @@ -66,7 +71,7 @@ export function build_layr(kmxplus: KMXPlusData, sect_strs: BUILDER_STRS, sect_l return null; // if there aren't any layers at all (which should be an invalid keyboard) } - let layr: BUILDER_LAYR = { + const layr: BUILDER_LAYR = { ident: constants.hex_section_id(constants.section.layr), size: constants.length_layr, _offset: 0, @@ -145,7 +150,7 @@ export function build_layr(kmxplus: KMXPlusData, sect_strs: BUILDER_STRS, sect_l layr.rowCount = layr.rows.length; layr.keyCount = layr.keys.length; - let offset = constants.length_layr + + const offset = constants.length_layr + (constants.length_layr_list * layr.listCount) + (constants.length_layr_entry * layr.layerCount) + (constants.length_layr_row * layr.rowCount) + diff --git a/common/web/types/src/kmx/kmx-plus-builder/build-list.ts b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-list.ts similarity index 88% rename from common/web/types/src/kmx/kmx-plus-builder/build-list.ts rename to developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-list.ts index 26659f8eb6..759f6498f4 100644 --- a/common/web/types/src/kmx/kmx-plus-builder/build-list.ts +++ b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-list.ts @@ -1,8 +1,11 @@ import { constants } from "@keymanapp/ldml-keyboard-constants"; -import { List, ListItem } from "../kmx-plus.js"; +import { KMXPlus } from "@keymanapp/common-types"; import { build_strs_index, BUILDER_STR_REF, BUILDER_STRS } from "./build-strs.js"; import { BUILDER_SECTION } from "./builder-section.js"; +import List = KMXPlus.List; +import ListItem = KMXPlus.ListItem; + /* ------------------------------------------------------------------ * list section ------------------------------------------------------------------ */ @@ -40,7 +43,7 @@ export function build_list(source_list: List, sect_strs: BUILDER_STRS): BUILDER_ return null; } - let result: BUILDER_LIST = { + const result: BUILDER_LIST = { ident: constants.hex_section_id(constants.section.list), size: 0, _offset: 0, @@ -51,13 +54,13 @@ export function build_list(source_list: List, sect_strs: BUILDER_STRS): BUILDER_ }; result.lists = source_list.lists.map(array => { - let list : BUILDER_LIST_LIST = { + const list : BUILDER_LIST_LIST = { index: result.indices.length, // the next indexcount count: array.length, _value: array }; array.forEach((i) => { - let index : BUILDER_LIST_INDEX = { + const index : BUILDER_LIST_INDEX = { // Get the final string index str: build_strs_index(sect_strs, i.value), _value: i.value.value, // unwrap the actual string value @@ -71,7 +74,7 @@ export function build_list(source_list: List, sect_strs: BUILDER_STRS): BUILDER_ // Sort the lists. result.lists.sort((a,b) => a._value.compareTo(b._value)); - let offset = constants.length_list + + const offset = constants.length_list + (constants.length_list_item * result.listCount) + (constants.length_list_index * result.indexCount); result.size = offset; @@ -86,14 +89,14 @@ export function build_list(source_list: List, sect_strs: BUILDER_STRS): BUILDER_ * @returns */ export function build_list_index(sect_list: BUILDER_LIST, value: ListItem) : BUILDER_LIST_REF { - if (!value) { + if (!value) { return 0; // empty list } if(!(value instanceof ListItem)) { throw new Error('unexpected value '+ value); } - let result = sect_list.lists.findIndex(v => v._value === value); + const result = sect_list.lists.findIndex(v => v._value === value); if(result < 0) { throw new Error('unexpectedly missing ListItem ' + value); // TODO-LDML: it's an array of strs } diff --git a/common/web/types/src/kmx/kmx-plus-builder/build-loca.ts b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-loca.ts similarity index 84% rename from common/web/types/src/kmx/kmx-plus-builder/build-loca.ts rename to developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-loca.ts index 9a72402c8c..4a81fcd9ab 100644 --- a/common/web/types/src/kmx/kmx-plus-builder/build-loca.ts +++ b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-loca.ts @@ -4,10 +4,12 @@ ------------------------------------------------------------------ */ import { constants } from "@keymanapp/ldml-keyboard-constants"; -import { KMXPlusData } from "../kmx-plus.js"; +import { KMXPlus } from "@keymanapp/common-types"; import { build_strs_index, BUILDER_STR_REF, BUILDER_STRS } from "./build-strs.js"; import { BUILDER_SECTION } from "./builder-section.js"; +import KMXPlusData = KMXPlus.KMXPlusData; + /** * Builder for the 'loca' section */ @@ -17,7 +19,7 @@ export interface BUILDER_LOCA extends BUILDER_SECTION { }; export function build_loca(kmxplus: KMXPlusData, sect_strs: BUILDER_STRS): BUILDER_LOCA { - let loca: BUILDER_LOCA = { + const loca: BUILDER_LOCA = { ident: constants.hex_section_id(constants.section.loca), size: constants.length_loca + constants.length_loca_item * kmxplus.loca.locales.length, _offset: 0, @@ -25,7 +27,7 @@ export function build_loca(kmxplus: KMXPlusData, sect_strs: BUILDER_STRS): BUILD items: [] }; - for(let item of kmxplus.loca.locales) { + for(const item of kmxplus.loca.locales) { loca.items.push(build_strs_index(sect_strs, item)); } diff --git a/common/web/types/src/kmx/kmx-plus-builder/build-meta.ts b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-meta.ts similarity index 93% rename from common/web/types/src/kmx/kmx-plus-builder/build-meta.ts rename to developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-meta.ts index 23dd303a7d..208051356e 100644 --- a/common/web/types/src/kmx/kmx-plus-builder/build-meta.ts +++ b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-meta.ts @@ -4,10 +4,12 @@ ------------------------------------------------------------------ */ import { constants } from "@keymanapp/ldml-keyboard-constants"; -import { KMXPlusData } from "../kmx-plus.js"; +import { KMXPlus } from "@keymanapp/common-types"; import { build_strs_index, BUILDER_STR_REF, BUILDER_STRS } from "./build-strs.js"; import { BUILDER_SECTION } from "./builder-section.js"; +import KMXPlusData = KMXPlus.KMXPlusData; + /** * Builder for the 'meta' section */ diff --git a/common/web/types/src/kmx/kmx-plus-builder/build-sect.ts b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-sect.ts similarity index 100% rename from common/web/types/src/kmx/kmx-plus-builder/build-sect.ts rename to developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-sect.ts diff --git a/common/web/types/src/kmx/kmx-plus-builder/build-strs.ts b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-strs.ts similarity index 89% rename from common/web/types/src/kmx/kmx-plus-builder/build-strs.ts rename to developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-strs.ts index 503de2d404..89d733f22d 100644 --- a/common/web/types/src/kmx/kmx-plus-builder/build-strs.ts +++ b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-strs.ts @@ -1,7 +1,10 @@ import { constants } from "@keymanapp/ldml-keyboard-constants"; -import { Strs, StrsItem } from "../kmx-plus.js"; +import { KMXPlus } from "@keymanapp/common-types"; import { BUILDER_SECTION } from "./builder-section.js"; +import Strs = KMXPlus.Strs; +import StrsItem = KMXPlus.StrsItem; + /** reference from build_strs_index */ export type BUILDER_STR_REF = number; @@ -26,7 +29,7 @@ export interface BUILDER_STRS extends BUILDER_SECTION { }; export function build_strs(source_strs: Strs): BUILDER_STRS { - let result: BUILDER_STRS = { + const result: BUILDER_STRS = { ident: constants.hex_section_id(constants.section.strs), size: 0, // finalized later _offset: 0, @@ -39,7 +42,7 @@ export function build_strs(source_strs: Strs): BUILDER_STRS { let offset = constants.length_strs + constants.length_strs_item * result.count; // TODO: consider padding - for(let item of result.items) { + for(const item of result.items) { item.offset = offset; offset += item.length * 2 + 2; /* UTF-16 code units + sizeof null terminator */ } @@ -64,7 +67,7 @@ export function build_strs_index(sect_strs: BUILDER_STRS, value: StrsItem) : BUI return value.char; } - let result = sect_strs.items.findIndex(v => v._value === value.value); + const result = sect_strs.items.findIndex(v => v._value === value.value); if(result < 0) { throw new Error('unexpectedly missing StrsItem '+value.value); } diff --git a/common/web/types/src/kmx/kmx-plus-builder/build-tran.ts b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-tran.ts similarity index 91% rename from common/web/types/src/kmx/kmx-plus-builder/build-tran.ts rename to developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-tran.ts index 316df69853..2473651b88 100644 --- a/common/web/types/src/kmx/kmx-plus-builder/build-tran.ts +++ b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-tran.ts @@ -1,10 +1,13 @@ import { constants } from "@keymanapp/ldml-keyboard-constants"; -import { Bksp, Tran } from "../kmx-plus.js"; +import { KMXPlus } from "@keymanapp/common-types"; import { BUILDER_ELEM, BUILDER_ELEM_REF, build_elem_index } from "./build-elem.js"; import { BUILDER_STRS, BUILDER_STR_REF, build_strs_index } from "./build-strs.js"; import { BUILDER_SECTION } from "./builder-section.js"; +import Bksp = KMXPlus.Bksp; +import Tran = KMXPlus.Tran; + /* ------------------------------------------------------------------ * tran section ------------------------------------------------------------------ */ @@ -44,7 +47,7 @@ export function build_tran(source_tran: Tran | Bksp, sect_strs: BUILDER_STRS, se return null; } - let tran: BUILDER_TRAN = { + const tran: BUILDER_TRAN = { ident: constants.hex_section_id(source_tran.id), size: 0, // need to compute total transforms + reorders _offset: 0, @@ -56,14 +59,14 @@ export function build_tran(source_tran: Tran | Bksp, sect_strs: BUILDER_STRS, se reorders: [], }; - for (let group of source_tran.groups) { + for (const group of source_tran.groups) { if (group.type === constants.tran_group_type_transform) { tran.groups.push({ type: group.type, count: group.transforms.length, index: tran.transforms.length, // index of first item }); - for (let transform of group.transforms) { + for (const transform of group.transforms) { tran.transforms.push({ from: build_strs_index(sect_strs, transform.from), to: build_strs_index(sect_strs, transform.to), @@ -77,7 +80,7 @@ export function build_tran(source_tran: Tran | Bksp, sect_strs: BUILDER_STRS, se count: group.reorders.length, index: tran.reorders.length, // index of first item }); - for (let reorder of group.reorders) { + for (const reorder of group.reorders) { tran.reorders.push({ elements: build_elem_index(sect_elem, reorder.elements), before: build_elem_index(sect_elem, reorder.before), diff --git a/common/web/types/src/kmx/kmx-plus-builder/build-uset.ts b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-uset.ts similarity index 89% rename from common/web/types/src/kmx/kmx-plus-builder/build-uset.ts rename to developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-uset.ts index 8c73afb796..1edd4d339f 100644 --- a/common/web/types/src/kmx/kmx-plus-builder/build-uset.ts +++ b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-uset.ts @@ -1,8 +1,12 @@ import { constants } from "@keymanapp/ldml-keyboard-constants"; -import { KMXPlusData, StrsItem, UsetItem } from "../kmx-plus.js"; +import { KMXPlus } from "@keymanapp/common-types"; import { build_strs_index, BUILDER_STR_REF, BUILDER_STRS } from "./build-strs.js"; import { BUILDER_SECTION, BUILDER_U32CHAR } from "./builder-section.js"; +import KMXPlusData = KMXPlus.KMXPlusData; +import StrsItem = KMXPlus.StrsItem; +import UsetItem = KMXPlus.UsetItem; + /** reference from build_uset_index */ export type BUILDER_USET_REF = number; @@ -80,7 +84,7 @@ export function build_uset_index(sect_uset: BUILDER_USET, value: UsetItem) { } } - let result = sect_uset.usets.findIndex(v => v._pattern.value === value.str.value); + const result = sect_uset.usets.findIndex(v => v._pattern.value === value.str.value); if(result < 0) { throw new Error('unexpectedly missing UsetItem ' + value.uset.toString()); } diff --git a/common/web/types/src/kmx/kmx-plus-builder/build-vars.ts b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-vars.ts similarity index 95% rename from common/web/types/src/kmx/kmx-plus-builder/build-vars.ts rename to developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-vars.ts index 8c09a169f6..92acbba9be 100644 --- a/common/web/types/src/kmx/kmx-plus-builder/build-vars.ts +++ b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/build-vars.ts @@ -1,10 +1,11 @@ import { constants } from "@keymanapp/ldml-keyboard-constants"; -import { KMXPlusData } from "../kmx-plus.js"; +import { KMXPlus } from "@keymanapp/common-types"; import { build_strs_index, BUILDER_STR_REF, BUILDER_STRS } from "./build-strs.js"; import { BUILDER_SECTION } from "./builder-section.js"; import { build_list_index, BUILDER_LIST, BUILDER_LIST_REF } from "./build-list.js"; import { build_elem_index, BUILDER_ELEM, BUILDER_ELEM_REF } from "./build-elem.js"; +import KMXPlusData = KMXPlus.KMXPlusData; interface BUILDER_VARS_ITEM { type: number; diff --git a/common/web/types/src/kmx/kmx-plus-builder/builder-section.ts b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/builder-section.ts similarity index 100% rename from common/web/types/src/kmx/kmx-plus-builder/builder-section.ts rename to developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/builder-section.ts diff --git a/common/web/types/src/kmx/kmx-plus-builder/kmx-plus-builder.ts b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/kmx-plus-builder.ts similarity index 93% rename from common/web/types/src/kmx/kmx-plus-builder/kmx-plus-builder.ts rename to developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/kmx-plus-builder.ts index 381e1d6d19..acc732c932 100644 --- a/common/web/types/src/kmx/kmx-plus-builder/kmx-plus-builder.ts +++ b/developer/src/common/web/utils/src/types/kmx/kmx-plus-builder/kmx-plus-builder.ts @@ -1,5 +1,5 @@ import * as r from 'restructure'; -import { KMXPlusFile } from "../kmx-plus.js"; +import { KMXPlus } from "@keymanapp/common-types"; import { constants, SectionIdent } from '@keymanapp/ldml-keyboard-constants'; import { BUILDER_SECTION } from './builder-section.js'; import { BUILDER_SECT, build_sect } from './build-sect.js'; @@ -15,6 +15,8 @@ import { BUILDER_TRAN, build_tran } from './build-tran.js'; import { BUILDER_USET, build_uset } from './build-uset.js'; import { BUILDER_VARS, build_vars } from './build-vars.js'; +import KMXPlusFile = KMXPlus.KMXPlusFile; + type BUILDER_BKSP = BUILDER_TRAN; // type BUILDER_FINL = BUILDER_TRAN; @@ -50,7 +52,7 @@ export default class KMXPlusBuilder { public compile(): Uint8Array { const fileSize = this.build(); - let file: Uint8Array = new Uint8Array(fileSize); + const file: Uint8Array = new Uint8Array(fileSize); this.emitSection(file, this.file.COMP_PLUS_SECT, this.sect.sect); // Keep the rest of these in order. @@ -155,13 +157,13 @@ export default class KMXPlusBuilder { } private emitStrings(file: Uint8Array) { - for(let item of this.sect.strs.items) { + for(const item of this.sect.strs.items) { if(item._value === '') { // We have a special case for the zero-length string - let sbuf = r.uint16le; + const sbuf = r.uint16le; file.set(sbuf.toBuffer(0), item.offset + this.sect.strs._offset); } else { - let sbuf = new r.String(null, 'utf16le'); + const sbuf = new r.String(null, 'utf16le'); file.set(sbuf.toBuffer(item._value), item.offset + this.sect.strs._offset); } } @@ -169,9 +171,9 @@ export default class KMXPlusBuilder { private emitElements(file: Uint8Array) { if(this.sect.elem) { - for(let str of this.sect.elem.strings) { + for(const str of this.sect.elem.strings) { if(str.items.length > 0) { - let COMP_PLUS_ELEM_ELEMENTS = new r.Array(this.file.COMP_PLUS_ELEM_ELEMENT, str.items.length); + const COMP_PLUS_ELEM_ELEMENTS = new r.Array(this.file.COMP_PLUS_ELEM_ELEMENT, str.items.length); file.set(COMP_PLUS_ELEM_ELEMENTS.toBuffer(str.items), str.offset + this.sect.elem._offset); } } diff --git a/common/web/types/src/kpj/keyman-developer-project.ts b/developer/src/common/web/utils/src/types/kpj/keyman-developer-project.ts similarity index 92% rename from common/web/types/src/kpj/keyman-developer-project.ts rename to developer/src/common/web/utils/src/types/kpj/keyman-developer-project.ts index 76f3ab709a..f678106a4c 100644 --- a/common/web/types/src/kpj/keyman-developer-project.ts +++ b/developer/src/common/web/utils/src/types/kpj/keyman-developer-project.ts @@ -2,8 +2,8 @@ // Version 1.0 and 2.0 of Keyman Developer Project .kpj file // -import { KeymanFileTypes } from '../main.js'; -import { CompilerCallbacks } from '../util/compiler-interfaces.js'; +import { KeymanFileTypes } from '@keymanapp/common-types'; +import { CompilerCallbacks } from '../../compiler-interfaces.js'; export class KeymanDeveloperProject { options: KeymanDeveloperProjectOptions; @@ -29,13 +29,13 @@ export class KeymanDeveloperProject { if(this.options.version != '2.0') { throw new Error('populateFiles can only be called on a v2.0 project'); } - let sourcePath = this.resolveProjectPath(this.options.sourcePath); + const sourcePath = this.resolveProjectPath(this.options.sourcePath); if(!this.callbacks.fs.existsSync(sourcePath)) { return false; } - let files = this.callbacks.fs.readdirSync(sourcePath); - for(let filename of files) { - let fullPath = this.callbacks.path.join(sourcePath, filename); + const files = this.callbacks.fs.readdirSync(sourcePath); + for(const filename of files) { + const fullPath = this.callbacks.path.join(sourcePath, filename); if(KeymanFileTypes.filenameIs(filename, KeymanFileTypes.Source.LdmlKeyboard)) { try { const data = this.callbacks.loadFile(fullPath); @@ -51,7 +51,7 @@ export class KeymanDeveloperProject { } } if(KeymanFileTypes.sourceTypeFromFilename(filename) !== null) { - let file = new KeymanDeveloperProjectFile20(fullPath, this.callbacks); + const file = new KeymanDeveloperProjectFile20(fullPath, this.callbacks); this.files.push(file); } } @@ -109,7 +109,7 @@ export class KeymanDeveloperProject { p = this.resolveProjectPath(p); - let f = file.filename.replace(new RegExp(`\\${sourceExt}$`, 'i'), targetExt); + const f = file.filename.replace(new RegExp(`\\${sourceExt}$`, 'i'), targetExt); return this.callbacks.path.normalize(this.callbacks.path.join(p, f)); } diff --git a/common/web/types/src/kpj/kpj-file-reader.ts b/developer/src/common/web/utils/src/types/kpj/kpj-file-reader.ts similarity index 81% rename from common/web/types/src/kpj/kpj-file-reader.ts rename to developer/src/common/web/utils/src/types/kpj/kpj-file-reader.ts index eb2a168a48..d776898753 100644 --- a/common/web/types/src/kpj/kpj-file-reader.ts +++ b/developer/src/common/web/utils/src/types/kpj/kpj-file-reader.ts @@ -1,9 +1,9 @@ -import * as xml2js from '../deps/xml2js/xml2js.js'; +import { xml2js } from '../../index.js'; import { KPJFile, KPJFileProject } from './kpj-file.js'; -import { boxXmlArray } from '../util/util.js'; +import { util } from '@keymanapp/common-types'; import { KeymanDeveloperProject, KeymanDeveloperProjectFile10, KeymanDeveloperProjectType } from './keyman-developer-project.js'; -import { CompilerCallbacks } from '../util/compiler-interfaces.js'; -import SchemaValidators from '../schema-validators.js'; +import { SchemaValidators } from '@keymanapp/common-types'; +import { CompilerCallbacks } from '../../compiler-interfaces.js'; export class KPJFileReader { constructor(private callbacks: CompilerCallbacks) { @@ -29,7 +29,7 @@ export class KPJFileReader { }); data = this.boxArrays(data); if(data.KeymanDeveloperProject?.Files?.File?.length) { - for(let file of data.KeymanDeveloperProject?.Files?.File) { + for(const file of data.KeymanDeveloperProject?.Files?.File) { // xml2js imports
as '' so we will just delete the empty string if(typeof file.Details == 'string') { delete file.Details; @@ -40,11 +40,11 @@ export class KPJFileReader { } public validate(source: KPJFile): void { - if(!SchemaValidators.kpj(source)) { - if(!SchemaValidators.kpj90(source)) { + if(!SchemaValidators.default.kpj(source)) { + if(!SchemaValidators.default.kpj90(source)) { // If the legacy schema also does not validate, then we will only report // the errors against the modern schema - throw new Error(JSON.stringify((SchemaValidators.kpj).errors)); + throw new Error(JSON.stringify((SchemaValidators.default.kpj).errors)); } } } @@ -60,8 +60,8 @@ export class KPJFileReader { // NOTE: at this point, the xml should have been validated // and matched the schema result so we can assume the source // is a valid shape - let project = source.KeymanDeveloperProject; - let result: KeymanDeveloperProject = new KeymanDeveloperProject(projectFilename, project.Options?.Version || "1.0", this.callbacks); + const project = source.KeymanDeveloperProject; + const result: KeymanDeveloperProject = new KeymanDeveloperProject(projectFilename, project.Options?.Version || "1.0", this.callbacks); if(result.options.version == '2.0') { result.options.buildPath = (project.Options?.BuildPath || result.options.buildPath).replace(/\\/g, '/'); result.options.sourcePath = (project.Options?.SourcePath || result.options.sourcePath).replace(/\\/g, '/'); @@ -88,9 +88,9 @@ export class KPJFileReader { } private transformFilesVersion10(project: KPJFileProject, result: KeymanDeveloperProject) { - let ids: { [id: string]: KeymanDeveloperProjectFile10; } = {}; - for (let sourceFile of project.Files?.File) { - let file: KeymanDeveloperProjectFile10 = new KeymanDeveloperProjectFile10( + const ids: { [id: string]: KeymanDeveloperProjectFile10; } = {}; + for (const sourceFile of project.Files?.File) { + const file: KeymanDeveloperProjectFile10 = new KeymanDeveloperProjectFile10( sourceFile.ID || '', (sourceFile.Filepath || '').replace(/\\/g, '/'), sourceFile.FileVersion || '', @@ -123,7 +123,7 @@ export class KPJFileReader { if(!source.KeymanDeveloperProject.Files || typeof source.KeymanDeveloperProject.Files == 'string') { source.KeymanDeveloperProject.Files = {File:[]}; } - boxXmlArray(source.KeymanDeveloperProject.Files, 'File'); + util.boxXmlArray(source.KeymanDeveloperProject.Files, 'File'); return source; } } \ No newline at end of file diff --git a/common/web/types/src/kpj/kpj-file.ts b/developer/src/common/web/utils/src/types/kpj/kpj-file.ts similarity index 100% rename from common/web/types/src/kpj/kpj-file.ts rename to developer/src/common/web/utils/src/types/kpj/kpj-file.ts diff --git a/common/web/types/src/package/kps-file.ts b/developer/src/common/web/utils/src/types/kps/kps-file.ts similarity index 100% rename from common/web/types/src/package/kps-file.ts rename to developer/src/common/web/utils/src/types/kps/kps-file.ts diff --git a/common/web/types/src/kvk/kvks-file-reader.ts b/developer/src/common/web/utils/src/types/kvks/kvks-file-reader.ts similarity index 78% rename from common/web/types/src/kvk/kvks-file-reader.ts rename to developer/src/common/web/utils/src/types/kvks/kvks-file-reader.ts index ff3a094e6f..6b2ad8e0a9 100644 --- a/common/web/types/src/kvk/kvks-file-reader.ts +++ b/developer/src/common/web/utils/src/types/kvks/kvks-file-reader.ts @@ -1,10 +1,19 @@ -import * as xml2js from '../deps/xml2js/xml2js.js'; +import { SchemaValidators as SV, KvkFile, util, Constants } from '@keymanapp/common-types'; +import { xml2js } from '../../index.js' import KVKSourceFile from './kvks-file.js'; -import { boxXmlArray } from '../util/util.js'; -import { DEFAULT_KVK_FONT, VisualKeyboard, VisualKeyboardHeaderFlags, VisualKeyboardKey, VisualKeyboardKeyFlags, VisualKeyboardLegalShiftStates, VisualKeyboardShiftState } from './visual-keyboard.js'; -import { USVirtualKeyCodes } from '../consts/virtual-key-constants.js'; -import { BUILDER_KVK_HEADER_VERSION, KVK_HEADER_IDENTIFIER_BYTES } from './kvk-file.js'; -import SchemaValidators from '../schema-validators.js'; +const SchemaValidators = SV.default; +import boxXmlArray = util.boxXmlArray; +import USVirtualKeyCodes = Constants.USVirtualKeyCodes; +import { VisualKeyboard as VK } from '@keymanapp/common-types'; +import DEFAULT_KVK_FONT = VK.DEFAULT_KVK_FONT; +import VisualKeyboard = VK.VisualKeyboard; +import VisualKeyboardHeaderFlags = VK.VisualKeyboardHeaderFlags; +import VisualKeyboardKey = VK.VisualKeyboardKey; +import VisualKeyboardKeyFlags = VK.VisualKeyboardKeyFlags; +import VisualKeyboardLegalShiftStates = VK.VisualKeyboardLegalShiftStates; +import VisualKeyboardShiftState = VK.VisualKeyboardShiftState; +import BUILDER_KVK_HEADER_VERSION = KvkFile.BUILDER_KVK_HEADER_VERSION; +import KVK_HEADER_IDENTIFIER_BYTES = KvkFile.KVK_HEADER_IDENTIFIER_BYTES; export default class KVKSFileReader { @@ -69,9 +78,9 @@ export default class KVKSFileReader { } } - for(let key of Object.keys(source)) { + for(const key of Object.keys(source)) { if(Array.isArray(source[key])) { - for(let item of source[key]) { + for(const item of source[key]) { if(typeof(item) === 'object') { this.cleanupUnderscore(key, item); } @@ -92,7 +101,7 @@ export default class KVKSFileReader { // NOTE: at this point, the xml should have been validated // and matched the schema result so we can assume properties exist - let result: VisualKeyboard = { + const result: VisualKeyboard = { header: { version: BUILDER_KVK_HEADER_VERSION, flags: 0, @@ -117,22 +126,22 @@ export default class KVKSFileReader { result.header.flags |= VisualKeyboardHeaderFlags.kvkhUseUnderlying; } - for(let encoding of source.visualkeyboard.encoding) { - let isUnicode = (encoding.$?.name == 'unicode'), + for(const encoding of source.visualkeyboard.encoding) { + const isUnicode = (encoding.$?.name == 'unicode'), font = isUnicode ? result.header.unicodeFont : result.header.ansiFont; font.name = encoding.$?.fontname ?? DEFAULT_KVK_FONT.name; font.size = parseInt(encoding.$?.fontsize ?? DEFAULT_KVK_FONT.size.toString(), 10); - for(let layer of encoding.layer) { - let shift = this.kvksShiftToKvkShift(layer.$?.shift); - for(let sourceKey of layer.key) { - let vkey = (USVirtualKeyCodes as any)[sourceKey.$?.vkey]; + for(const layer of encoding.layer) { + const shift = this.kvksShiftToKvkShift(layer.$?.shift); + for(const sourceKey of layer.key) { + const vkey = (USVirtualKeyCodes as any)[sourceKey.$?.vkey]; if(!vkey) { if(typeof invalidVkeys !== 'undefined') { invalidVkeys.push(sourceKey.$?.vkey); } continue; } - let key: VisualKeyboardKey = { + const key: VisualKeyboardKey = { flags: (isUnicode ? VisualKeyboardKeyFlags.kvkkUnicode : 0) | (sourceKey.bitmap ? VisualKeyboardKeyFlags.kvkkBitmap : 0), @@ -167,9 +176,9 @@ export default class KVKSFileReader { */ private boxArrays(source: KVKSourceFile) { boxXmlArray(source.visualkeyboard, 'encoding'); - for(let encoding of source.visualkeyboard.encoding) { + for(const encoding of source.visualkeyboard.encoding) { boxXmlArray(encoding, 'layer'); - for(let layer of encoding.layer) { + for(const layer of encoding.layer) { boxXmlArray(layer, 'key'); } } @@ -181,7 +190,7 @@ export default class KVKSFileReader { shift = shift.toUpperCase(); // TODO-LDML(lowpri): make a map of this? - for(let state of VisualKeyboardLegalShiftStates) { + for(const state of VisualKeyboardLegalShiftStates) { if(state.name == shift) { return state.shift; } diff --git a/common/web/types/src/kvk/kvks-file-writer.ts b/developer/src/common/web/utils/src/types/kvks/kvks-file-writer.ts similarity index 73% rename from common/web/types/src/kvk/kvks-file-writer.ts rename to developer/src/common/web/utils/src/types/kvks/kvks-file-writer.ts index 19327e779d..dd4962a8fa 100644 --- a/common/web/types/src/kvk/kvks-file-writer.ts +++ b/developer/src/common/web/utils/src/types/kvks/kvks-file-writer.ts @@ -1,7 +1,13 @@ -import * as xml2js from '../deps/xml2js/xml2js.js'; +import { VisualKeyboard as VK, Constants } from '@keymanapp/common-types'; import KVKSourceFile, { KVKSEncoding, KVKSFlags, KVKSKey, KVKSLayer } from './kvks-file.js'; -import { VisualKeyboard, VisualKeyboardHeaderFlags, VisualKeyboardKeyFlags, VisualKeyboardLegalShiftStates, VisualKeyboardShiftState } from './visual-keyboard.js'; -import { USVirtualKeyCodes } from '../consts/virtual-key-constants.js'; +import { xml2js } from '../../index.js'; + +import USVirtualKeyCodes = Constants.USVirtualKeyCodes; +import VisualKeyboard = VK.VisualKeyboard; +import VisualKeyboardHeaderFlags = VK.VisualKeyboardHeaderFlags; +import VisualKeyboardKeyFlags = VK.VisualKeyboardKeyFlags; +import VisualKeyboardLegalShiftStates = VK.VisualKeyboardLegalShiftStates; +import VisualKeyboardShiftState = VK.VisualKeyboardShiftState; export default class KVKSFileWriter { public write(vk: VisualKeyboard): string { @@ -17,7 +23,7 @@ export default class KVKSFileWriter { } }) - let flags: KVKSFlags = {}; + const flags: KVKSFlags = {}; if(vk.header.flags & VisualKeyboardHeaderFlags.kvkhDisplayUnderlying) { flags.displayunderlying = ''; } @@ -33,7 +39,7 @@ export default class KVKSFileWriter { - let kvks: KVKSourceFile = { + const kvks: KVKSourceFile = { visualkeyboard: { header: { version: '10.0', @@ -46,9 +52,9 @@ export default class KVKSFileWriter { if(vk.header.underlyingLayout) kvks.visualkeyboard.header.layout = vk.header.underlyingLayout; - let encodings: {ansi: {o: KVKSEncoding, l: {[name:string]:KVKSLayer}}, unicode: {o: KVKSEncoding, l: {[name:string]:KVKSLayer}}} = {ansi:null,unicode:null}; + const encodings: {ansi: {o: KVKSEncoding, l: {[name:string]:KVKSLayer}}, unicode: {o: KVKSEncoding, l: {[name:string]:KVKSLayer}}} = {ansi:null,unicode:null}; - for(let key of vk.keys) { + for(const key of vk.keys) { const encoding = key.flags & VisualKeyboardKeyFlags.kvkkUnicode ? 'unicode' : 'ansi'; const shift = this.kvkShiftToKvksShift(key.shift); @@ -65,7 +71,7 @@ export default class KVKSFileWriter { }; kvks.visualkeyboard.encoding.push(encodings[encoding].o); } - let e = encodings[encoding]; + const e = encodings[encoding]; if(!e.l[shift]) { e.l[shift] = { key: [], @@ -73,11 +79,11 @@ export default class KVKSFileWriter { }; e.o.layer.push(e.l[shift]); } - let l = e.l[shift]; + const l = e.l[shift]; // TODO-LDML: map let vkeyName = ''; - for(let vkey of Object.keys(USVirtualKeyCodes)) { + for(const vkey of Object.keys(USVirtualKeyCodes)) { if((USVirtualKeyCodes as any)[vkey] == key.vkey) { vkeyName = vkey; break; @@ -88,7 +94,7 @@ export default class KVKSFileWriter { //TODO-LDML: warn continue; } - let k: KVKSKey = { + const k: KVKSKey = { $: {vkey: vkeyName}, _: key.text, } @@ -99,7 +105,7 @@ export default class KVKSFileWriter { l.key.push(k); } - let result = builder.buildObject(kvks); + const result = builder.buildObject(kvks); return result; //Uint8Array.from(result); } @@ -111,7 +117,7 @@ export default class KVKSFileWriter { public kvkShiftToKvksShift(shift: VisualKeyboardShiftState): string { // TODO-LDML(lowpri): make a map of this? - for(let state of VisualKeyboardLegalShiftStates) { + for(const state of VisualKeyboardLegalShiftStates) { if(state.shift == shift) { return state.name; } diff --git a/common/web/types/src/kvk/kvks-file.ts b/developer/src/common/web/utils/src/types/kvks/kvks-file.ts similarity index 100% rename from common/web/types/src/kvk/kvks-file.ts rename to developer/src/common/web/utils/src/types/kvks/kvks-file.ts diff --git a/common/web/types/src/ldml-keyboard/ldml-keyboard-testdata-xml.ts b/developer/src/common/web/utils/src/types/ldml-keyboard/ldml-keyboard-testdata-xml.ts similarity index 100% rename from common/web/types/src/ldml-keyboard/ldml-keyboard-testdata-xml.ts rename to developer/src/common/web/utils/src/types/ldml-keyboard/ldml-keyboard-testdata-xml.ts diff --git a/common/web/types/src/ldml-keyboard/ldml-keyboard-xml-reader.ts b/developer/src/common/web/utils/src/types/ldml-keyboard/ldml-keyboard-xml-reader.ts similarity index 93% rename from common/web/types/src/ldml-keyboard/ldml-keyboard-xml-reader.ts rename to developer/src/common/web/utils/src/types/ldml-keyboard/ldml-keyboard-xml-reader.ts index 9055e8ed1d..162cac4aac 100644 --- a/common/web/types/src/ldml-keyboard/ldml-keyboard-xml-reader.ts +++ b/developer/src/common/web/utils/src/types/ldml-keyboard/ldml-keyboard-xml-reader.ts @@ -1,11 +1,12 @@ -import * as xml2js from '../deps/xml2js/xml2js.js'; +import { SchemaValidators, util } from '@keymanapp/common-types'; +import { xml2js } from '../../index.js'; +import { CommonTypesMessages } from '../../common-events.js'; +import { CompilerCallbacks } from '../../compiler-interfaces.js'; import { LDMLKeyboardXMLSourceFile, LKImport, ImportStatus } from './ldml-keyboard-xml.js'; -import { boxXmlArray } from '../util/util.js'; -import { CompilerCallbacks } from '../util/compiler-interfaces.js'; import { constants } from '@keymanapp/ldml-keyboard-constants'; -import { CommonTypesMessages } from '../util/common-events.js'; import { LDMLKeyboardTestDataXMLSourceFile, LKTTest, LKTTests } from './ldml-keyboard-testdata-xml.js'; -import SchemaValidators from '../schema-validators.js'; + +import boxXmlArray = util.boxXmlArray; interface NameAndProps { '$'?: any; // content @@ -22,7 +23,7 @@ export class LDMLKeyboardXMLSourceFileReader { } static get defaultImportsURL(): [string,string] { - return ['../import/', import.meta.url]; + return ['../../import/', import.meta.url]; } readImportFile(version: string, subpath: string): Uint8Array { @@ -63,10 +64,10 @@ export class LDMLKeyboardXMLSourceFileReader { boxXmlArray(source?.keyboard3?.locales, 'locale'); boxXmlArray(source?.keyboard3, 'transforms'); if(source?.keyboard3?.layers) { - for(let layers of source?.keyboard3?.layers) { + for(const layers of source?.keyboard3?.layers) { boxXmlArray(layers, 'layer'); if(layers?.layer) { - for(let layer of layers?.layer) { + for(const layer of layers?.layer) { boxXmlArray(layer, 'row'); } } @@ -74,13 +75,13 @@ export class LDMLKeyboardXMLSourceFileReader { } if(source?.keyboard3?.forms?.form) { boxXmlArray(source?.keyboard3?.forms, 'form'); - for(let form of source?.keyboard3?.forms?.form) { + for(const form of source?.keyboard3?.forms?.form) { boxXmlArray(form, 'scanCodes'); } } if(source?.keyboard3?.flicks) { boxXmlArray(source?.keyboard3?.flicks, 'flick'); - for(let flick of source?.keyboard3?.flicks?.flick) { + for(const flick of source?.keyboard3?.flicks?.flick) { boxXmlArray(flick, 'flickSegment'); } } @@ -90,9 +91,9 @@ export class LDMLKeyboardXMLSourceFileReader { boxXmlArray(source?.keyboard3?.variables, 'uset'); } if(source?.keyboard3?.transforms) { - for(let transforms of source.keyboard3.transforms) { + for(const transforms of source.keyboard3.transforms) { boxXmlArray(transforms, 'transformGroup'); - for (let transformGroup of transforms.transformGroup) { + for (const transformGroup of transforms.transformGroup) { boxXmlArray(transformGroup, 'transform'); boxXmlArray(transformGroup, 'reorder'); } @@ -235,8 +236,8 @@ export class LDMLKeyboardXMLSourceFileReader { * @returns true if valid, false if invalid */ public validate(source: LDMLKeyboardXMLSourceFile | LDMLKeyboardTestDataXMLSourceFile): boolean { - if(!SchemaValidators.ldmlKeyboard3(source)) { - for (let err of (SchemaValidators.ldmlKeyboard3).errors) { + if(!SchemaValidators.default.ldmlKeyboard3(source)) { + for (const err of (SchemaValidators.default.ldmlKeyboard3).errors) { this.callbacks.reportMessage(CommonTypesMessages.Error_SchemaValidationError({ instancePath: err.instancePath, keyword: err.keyword, @@ -250,9 +251,9 @@ export class LDMLKeyboardXMLSourceFileReader { } loadUnboxed(file: Uint8Array): LDMLKeyboardXMLSourceFile { - let source = (() => { + const source = (() => { let a: LDMLKeyboardXMLSourceFile; - let parser = new xml2js.Parser({ + const parser = new xml2js.Parser({ explicitArray: false, mergeAttrs: true, includeWhiteChars: false, @@ -289,9 +290,9 @@ export class LDMLKeyboardXMLSourceFileReader { } loadTestDataUnboxed(file: Uint8Array): any { - let source = (() => { + const source = (() => { let a: any; - let parser = new xml2js.Parser({ + const parser = new xml2js.Parser({ // explicitArray: false, preserveChildrenOrder:true, // needed for test data explicitChildren: true, // needed for test data diff --git a/common/web/types/src/ldml-keyboard/ldml-keyboard-xml.ts b/developer/src/common/web/utils/src/types/ldml-keyboard/ldml-keyboard-xml.ts similarity index 100% rename from common/web/types/src/ldml-keyboard/ldml-keyboard-xml.ts rename to developer/src/common/web/utils/src/types/ldml-keyboard/ldml-keyboard-xml.ts diff --git a/developer/src/common/web/utils/src/KeymanSentry.ts b/developer/src/common/web/utils/src/utils/KeymanSentry.ts similarity index 100% rename from developer/src/common/web/utils/src/KeymanSentry.ts rename to developer/src/common/web/utils/src/utils/KeymanSentry.ts diff --git a/developer/src/common/web/utils/src/keyman-urls.ts b/developer/src/common/web/utils/src/utils/keyman-urls.ts similarity index 100% rename from developer/src/common/web/utils/src/keyman-urls.ts rename to developer/src/common/web/utils/src/utils/keyman-urls.ts diff --git a/developer/src/common/web/utils/src/markdown.ts b/developer/src/common/web/utils/src/utils/markdown.ts similarity index 100% rename from developer/src/common/web/utils/src/markdown.ts rename to developer/src/common/web/utils/src/utils/markdown.ts diff --git a/developer/src/common/web/utils/src/options.ts b/developer/src/common/web/utils/src/utils/options.ts similarity index 100% rename from developer/src/common/web/utils/src/options.ts rename to developer/src/common/web/utils/src/utils/options.ts diff --git a/developer/src/common/web/utils/src/validate-mit-license.ts b/developer/src/common/web/utils/src/utils/validate-mit-license.ts similarity index 100% rename from developer/src/common/web/utils/src/validate-mit-license.ts rename to developer/src/common/web/utils/src/utils/validate-mit-license.ts diff --git a/common/web/types/test/helpers/TestCompilerCallbacks.ts b/developer/src/common/web/utils/test/TestCompilerCallbacks.ts similarity index 87% rename from common/web/types/test/helpers/TestCompilerCallbacks.ts rename to developer/src/common/web/utils/test/TestCompilerCallbacks.ts index d231290fef..d1413e477a 100644 --- a/common/web/types/test/helpers/TestCompilerCallbacks.ts +++ b/developer/src/common/web/utils/test/TestCompilerCallbacks.ts @@ -1,7 +1,7 @@ import * as fs from 'fs'; import * as path from 'path'; -import { loadFile, resolveFilename } from '../helpers/index.js'; -import { CompilerCallbacks, CompilerError, CompilerEvent, CompilerFileSystemCallbacks, CompilerPathCallbacks } from '../../src/util/compiler-interfaces.js'; +import { loadFile, resolveFilename } from './helpers/index.js'; +import { CompilerCallbacks, CompilerError, CompilerEvent, CompilerFileSystemCallbacks, CompilerPathCallbacks } from '../src/compiler-interfaces.js'; // This is related to developer/src/common/web/test-helpers/index.ts but has a slightly different API surface // as this runs at a lower level than the compiler. @@ -40,7 +40,7 @@ export class TestCompilerCallbacks implements CompilerCallbacks { return loadFile(filename); } catch (e) { if (e.code === 'ENOENT') { - return null; + return null; } else { throw e; } diff --git a/common/web/types/test/fixtures/keyman-touch-layout/khmer_angkor.keyman-touch-layout b/developer/src/common/web/utils/test/fixtures/keyman-touch-layout/khmer_angkor.keyman-touch-layout similarity index 100% rename from common/web/types/test/fixtures/keyman-touch-layout/khmer_angkor.keyman-touch-layout rename to developer/src/common/web/utils/test/fixtures/keyman-touch-layout/khmer_angkor.keyman-touch-layout diff --git a/common/web/types/test/fixtures/keyman-touch-layout/legacy.keyman-touch-layout b/developer/src/common/web/utils/test/fixtures/keyman-touch-layout/legacy.keyman-touch-layout similarity index 100% rename from common/web/types/test/fixtures/keyman-touch-layout/legacy.keyman-touch-layout rename to developer/src/common/web/utils/test/fixtures/keyman-touch-layout/legacy.keyman-touch-layout diff --git a/common/web/types/test/fixtures/kpj/khmer_angkor.kpj b/developer/src/common/web/utils/test/fixtures/kpj/khmer_angkor.kpj similarity index 100% rename from common/web/types/test/fixtures/kpj/khmer_angkor.kpj rename to developer/src/common/web/utils/test/fixtures/kpj/khmer_angkor.kpj diff --git a/common/web/types/test/fixtures/kpj/project-missing-file/project_missing_file.kpj b/developer/src/common/web/utils/test/fixtures/kpj/project-missing-file/project_missing_file.kpj similarity index 100% rename from common/web/types/test/fixtures/kpj/project-missing-file/project_missing_file.kpj rename to developer/src/common/web/utils/test/fixtures/kpj/project-missing-file/project_missing_file.kpj diff --git a/common/web/types/test/fixtures/kpj/project-missing-file/project_missing_files.kpj b/developer/src/common/web/utils/test/fixtures/kpj/project-missing-file/project_missing_files.kpj similarity index 100% rename from common/web/types/test/fixtures/kpj/project-missing-file/project_missing_files.kpj rename to developer/src/common/web/utils/test/fixtures/kpj/project-missing-file/project_missing_files.kpj diff --git a/developer/src/common/web/utils/test/fixtures/kvks/balochi_inpage.kvk b/developer/src/common/web/utils/test/fixtures/kvks/balochi_inpage.kvk new file mode 100644 index 0000000000..56fee9dfbd Binary files /dev/null and b/developer/src/common/web/utils/test/fixtures/kvks/balochi_inpage.kvk differ diff --git a/common/web/types/test/fixtures/kvk/balochi_inpage.kvks b/developer/src/common/web/utils/test/fixtures/kvks/balochi_inpage.kvks similarity index 100% rename from common/web/types/test/fixtures/kvk/balochi_inpage.kvks rename to developer/src/common/web/utils/test/fixtures/kvks/balochi_inpage.kvks diff --git a/developer/src/common/web/utils/test/fixtures/kvks/khmer_angkor.kvk b/developer/src/common/web/utils/test/fixtures/kvks/khmer_angkor.kvk new file mode 100644 index 0000000000..c64b3a5a54 Binary files /dev/null and b/developer/src/common/web/utils/test/fixtures/kvks/khmer_angkor.kvk differ diff --git a/common/web/types/test/fixtures/kvk/khmer_angkor.kvks b/developer/src/common/web/utils/test/fixtures/kvks/khmer_angkor.kvks similarity index 100% rename from common/web/types/test/fixtures/kvk/khmer_angkor.kvks rename to developer/src/common/web/utils/test/fixtures/kvks/khmer_angkor.kvks diff --git a/common/web/types/test/fixtures/import-minimal.xml b/developer/src/common/web/utils/test/fixtures/ldml-keyboard/import-minimal.xml similarity index 100% rename from common/web/types/test/fixtures/import-minimal.xml rename to developer/src/common/web/utils/test/fixtures/ldml-keyboard/import-minimal.xml diff --git a/common/web/types/test/fixtures/import-minimal1.xml b/developer/src/common/web/utils/test/fixtures/ldml-keyboard/import-minimal1.xml similarity index 100% rename from common/web/types/test/fixtures/import-minimal1.xml rename to developer/src/common/web/utils/test/fixtures/ldml-keyboard/import-minimal1.xml diff --git a/common/web/types/test/fixtures/import-minimal2.xml b/developer/src/common/web/utils/test/fixtures/ldml-keyboard/import-minimal2.xml similarity index 100% rename from common/web/types/test/fixtures/import-minimal2.xml rename to developer/src/common/web/utils/test/fixtures/ldml-keyboard/import-minimal2.xml diff --git a/common/web/types/test/fixtures/import-symbols.xml b/developer/src/common/web/utils/test/fixtures/ldml-keyboard/import-symbols.xml similarity index 100% rename from common/web/types/test/fixtures/import-symbols.xml rename to developer/src/common/web/utils/test/fixtures/ldml-keyboard/import-symbols.xml diff --git a/common/web/types/test/fixtures/invalid-conforms-to.xml b/developer/src/common/web/utils/test/fixtures/ldml-keyboard/invalid-conforms-to.xml similarity index 100% rename from common/web/types/test/fixtures/invalid-conforms-to.xml rename to developer/src/common/web/utils/test/fixtures/ldml-keyboard/invalid-conforms-to.xml diff --git a/common/web/types/test/fixtures/invalid-import-base.xml b/developer/src/common/web/utils/test/fixtures/ldml-keyboard/invalid-import-base.xml similarity index 100% rename from common/web/types/test/fixtures/invalid-import-base.xml rename to developer/src/common/web/utils/test/fixtures/ldml-keyboard/invalid-import-base.xml diff --git a/common/web/types/test/fixtures/invalid-import-path.xml b/developer/src/common/web/utils/test/fixtures/ldml-keyboard/invalid-import-path.xml similarity index 100% rename from common/web/types/test/fixtures/invalid-import-path.xml rename to developer/src/common/web/utils/test/fixtures/ldml-keyboard/invalid-import-path.xml diff --git a/common/web/types/test/fixtures/invalid-import-readfail.xml b/developer/src/common/web/utils/test/fixtures/ldml-keyboard/invalid-import-readfail.xml similarity index 100% rename from common/web/types/test/fixtures/invalid-import-readfail.xml rename to developer/src/common/web/utils/test/fixtures/ldml-keyboard/invalid-import-readfail.xml diff --git a/common/web/types/test/fixtures/invalid-import-wrongroot.xml b/developer/src/common/web/utils/test/fixtures/ldml-keyboard/invalid-import-wrongroot.xml similarity index 100% rename from common/web/types/test/fixtures/invalid-import-wrongroot.xml rename to developer/src/common/web/utils/test/fixtures/ldml-keyboard/invalid-import-wrongroot.xml diff --git a/common/web/types/test/fixtures/invalid-structure-per-dtd.xml b/developer/src/common/web/utils/test/fixtures/ldml-keyboard/invalid-structure-per-dtd.xml similarity index 100% rename from common/web/types/test/fixtures/invalid-structure-per-dtd.xml rename to developer/src/common/web/utils/test/fixtures/ldml-keyboard/invalid-structure-per-dtd.xml diff --git a/common/web/types/test/fixtures/test-fr.xml b/developer/src/common/web/utils/test/fixtures/ldml-keyboard/test-fr.xml similarity index 100% rename from common/web/types/test/fixtures/test-fr.xml rename to developer/src/common/web/utils/test/fixtures/ldml-keyboard/test-fr.xml diff --git a/developer/src/common/web/utils/test/helpers/index.ts b/developer/src/common/web/utils/test/helpers/index.ts index 9968fbfea6..e36d07429b 100644 --- a/developer/src/common/web/utils/test/helpers/index.ts +++ b/developer/src/common/web/utils/test/helpers/index.ts @@ -2,6 +2,7 @@ * Helpers and utilities for the Mocha tests. */ import * as path from 'path'; +import * as fs from "fs"; import { fileURLToPath } from 'url'; /** @@ -16,3 +17,25 @@ import { fileURLToPath } from 'url'; return fileURLToPath(new URL(path.join('..', '..', '..', 'test', 'fixtures', ...components), import.meta.url)); } +export function loadFile(filename: string | URL): Buffer { + return fs.readFileSync(filename); +} + +export function resolveFilename(baseFilename: string, filename: string) { + const basePath = + baseFilename.endsWith('/') || baseFilename.endsWith('\\') ? + baseFilename : + path.dirname(baseFilename); + // Transform separators to platform separators -- we are agnostic + // in our use here but path prefers files may use + // either / or \, although older kps files were always \. + if(path.sep == '/') { + filename = filename.replace(/\\/g, '/'); + } else { + filename = filename.replace(/\//g, '\\'); + } + if(!path.isAbsolute(filename)) { + filename = path.resolve(basePath, filename); + } + return filename; +} diff --git a/common/web/types/test/helpers/reader-callback-test.ts b/developer/src/common/web/utils/test/helpers/reader-callback-test.ts similarity index 88% rename from common/web/types/test/helpers/reader-callback-test.ts rename to developer/src/common/web/utils/test/helpers/reader-callback-test.ts index 907793cdf7..c67d49dfdb 100644 --- a/common/web/types/test/helpers/reader-callback-test.ts +++ b/developer/src/common/web/utils/test/helpers/reader-callback-test.ts @@ -1,11 +1,11 @@ import 'mocha'; import {assert} from 'chai'; -import { loadFile, makePathToFixture } from '../helpers/index.js'; -import { LDMLKeyboardXMLSourceFileReader, LDMLKeyboardXMLSourceFileReaderOptions } from '../../src/ldml-keyboard/ldml-keyboard-xml-reader.js'; -import { CompilerEvent } from '../../src/util/compiler-interfaces.js'; -import { LDMLKeyboardXMLSourceFile } from '../../src/ldml-keyboard/ldml-keyboard-xml.js'; -import { LDMLKeyboardTestDataXMLSourceFile } from '../ldml-keyboard/ldml-keyboard-testdata-xml.js'; -import { TestCompilerCallbacks } from './TestCompilerCallbacks.js'; +import { loadFile, makePathToFixture } from './index.js'; +import { LDMLKeyboardXMLSourceFileReader, LDMLKeyboardXMLSourceFileReaderOptions } from '../../src/types/ldml-keyboard/ldml-keyboard-xml-reader.js'; +import { CompilerEvent } from '../../src/compiler-interfaces.js'; +import { LDMLKeyboardXMLSourceFile } from '../../src/types/ldml-keyboard/ldml-keyboard-xml.js'; +import { LDMLKeyboardTestDataXMLSourceFile } from '../../src/types/ldml-keyboard/ldml-keyboard-testdata-xml.js'; +import { TestCompilerCallbacks } from '@keymanapp/developer-test-helpers'; import { fileURLToPath } from 'url'; const readerOptions: LDMLKeyboardXMLSourceFileReaderOptions = { @@ -77,14 +77,14 @@ export function testReaderCases(cases : CompilationCase[]) { // we need our own callbacks rather than using the global so messages don't get mixed const callbacks = new TestCompilerCallbacks(); const reader = new LDMLKeyboardXMLSourceFileReader(readerOptions, callbacks); - for (let testcase of cases) { + for (const testcase of cases) { const expectFailure = testcase.throws || !!(testcase.errors); // if true, we expect this to fail const testHeading = expectFailure ? `should fail to load: ${testcase.subpath}`: `should load: ${testcase.subpath}`; it(testHeading, function () { callbacks.clear(); - const data = loadFile(makePathToFixture(testcase.subpath)); + const data = loadFile(makePathToFixture('ldml-keyboard', testcase.subpath)); assert.ok(data, `reading ${testcase.subpath}`); const source = reader.load(data); if (!testcase.loadfail) { @@ -128,14 +128,14 @@ export function testTestdataReaderCases(cases : TestDataCase[]) { // we need our own callbacks rather than using the global so messages don't get mixed const callbacks = new TestCompilerCallbacks(); const reader = new LDMLKeyboardXMLSourceFileReader(readerOptions, callbacks); - for (let testcase of cases) { + for (const testcase of cases) { const expectFailure = testcase.throws || !!(testcase.errors); // if true, we expect this to fail const testHeading = expectFailure ? `should fail to load: ${testcase.subpath}`: `should load: ${testcase.subpath}`; it(testHeading, function () { callbacks.clear(); - const data = loadFile(makePathToFixture(testcase.subpath)); + const data = loadFile(makePathToFixture('ldml-keyboard', testcase.subpath)); assert.ok(data, `reading ${testcase.subpath}`); const source = reader.loadTestData(data); if (!testcase.loadfail) { diff --git a/common/web/types/test/keyman-touch-layout/test-keyman-touch-layout-file-reader.ts b/developer/src/common/web/utils/test/keyman-touch-layout/test-keyman-touch-layout-file-reader.ts similarity index 96% rename from common/web/types/test/keyman-touch-layout/test-keyman-touch-layout-file-reader.ts rename to developer/src/common/web/utils/test/keyman-touch-layout/test-keyman-touch-layout-file-reader.ts index 479f2c4ccb..bfebec85e8 100644 --- a/common/web/types/test/keyman-touch-layout/test-keyman-touch-layout-file-reader.ts +++ b/developer/src/common/web/utils/test/keyman-touch-layout/test-keyman-touch-layout-file-reader.ts @@ -2,7 +2,7 @@ import * as fs from 'fs'; import 'mocha'; import { assert } from 'chai'; import { makePathToFixture } from '../helpers/index.js'; -import { TouchLayoutFileReader } from "../../src/keyman-touch-layout/keyman-touch-layout-file-reader.js"; +import { TouchLayoutFileReader } from "../../src/types/keyman-touch-layout/keyman-touch-layout-file-reader.js"; describe('TouchLayoutFileReader', function () { it('should read a valid file', function() { diff --git a/common/web/types/test/keyman-touch-layout/test-keyman-touch-layout-round-trip.ts b/developer/src/common/web/utils/test/keyman-touch-layout/test-keyman-touch-layout-round-trip.ts similarity index 81% rename from common/web/types/test/keyman-touch-layout/test-keyman-touch-layout-round-trip.ts rename to developer/src/common/web/utils/test/keyman-touch-layout/test-keyman-touch-layout-round-trip.ts index f6a09d08d3..25870e6e09 100644 --- a/common/web/types/test/keyman-touch-layout/test-keyman-touch-layout-round-trip.ts +++ b/developer/src/common/web/utils/test/keyman-touch-layout/test-keyman-touch-layout-round-trip.ts @@ -2,8 +2,8 @@ import * as fs from 'fs'; import 'mocha'; import { assert } from 'chai'; import { makePathToFixture } from '../helpers/index.js'; -import { TouchLayoutFileReader } from "../../src/keyman-touch-layout/keyman-touch-layout-file-reader.js"; -import { TouchLayoutFileWriter } from "../../src/keyman-touch-layout/keyman-touch-layout-file-writer.js"; +import { TouchLayoutFileReader } from "../../src/types/keyman-touch-layout/keyman-touch-layout-file-reader.js"; +import { TouchLayoutFileWriter } from "../../src/types/keyman-touch-layout/keyman-touch-layout-file-writer.js"; describe('TouchLayoutFile', function () { it('should round-trip from TouchLayoutFileReader to TouchLayoutFileWriter', function() { @@ -26,7 +26,7 @@ describe('TouchLayoutFile', function () { assert.deepEqual(layout, newLayout); // And do the same without any options - let output2 = writer.write(layout); + const output2 = writer.write(layout); assert.deepEqual(output, output2); newLayout = reader.read(output2); diff --git a/common/web/types/test/ldml-keyboard/test-ldml-keyboard-testdata-reader.ts b/developer/src/common/web/utils/test/kmx/test-ldml-keyboard-testdata-reader.ts similarity index 96% rename from common/web/types/test/ldml-keyboard/test-ldml-keyboard-testdata-reader.ts rename to developer/src/common/web/utils/test/kmx/test-ldml-keyboard-testdata-reader.ts index 794adbbe66..d2ce6dc72a 100644 --- a/common/web/types/test/ldml-keyboard/test-ldml-keyboard-testdata-reader.ts +++ b/developer/src/common/web/utils/test/kmx/test-ldml-keyboard-testdata-reader.ts @@ -2,7 +2,7 @@ import { constants } from '@keymanapp/ldml-keyboard-constants'; import { assert } from 'chai'; import 'mocha'; import { testTestdataReaderCases } from '../helpers/reader-callback-test.js'; -import { LKTAnyAction } from './ldml-keyboard-testdata-xml.js'; +import { LKTAnyAction } from '../../src/types/ldml-keyboard/ldml-keyboard-testdata-xml.js'; describe('ldml keyboard xml reader tests', function () { this.slow(500); // 0.5 sec -- json schema validation takes a while diff --git a/common/web/types/test/ldml-keyboard/test-ldml-keyboard-xml-reader.ts b/developer/src/common/web/utils/test/kmx/test-ldml-keyboard-xml-reader.ts similarity index 95% rename from common/web/types/test/ldml-keyboard/test-ldml-keyboard-xml-reader.ts rename to developer/src/common/web/utils/test/kmx/test-ldml-keyboard-xml-reader.ts index fa99be5267..a79960c7ca 100644 --- a/common/web/types/test/ldml-keyboard/test-ldml-keyboard-xml-reader.ts +++ b/developer/src/common/web/utils/test/kmx/test-ldml-keyboard-xml-reader.ts @@ -1,9 +1,13 @@ -import { LKKey, ImportStatus } from './../../src/ldml-keyboard/ldml-keyboard-xml.js'; +import { LKKey, ImportStatus } from '../../src/types/ldml-keyboard/ldml-keyboard-xml.js'; import 'mocha'; import {assert} from 'chai'; -import { CommonTypesMessages } from '../../src/util/common-events.js'; +import { CommonTypesMessages } from '../../src/common-events.js'; import { testReaderCases } from '../helpers/reader-callback-test.js'; -import { CLDRScanToVkey, CLDRScanToKeyMap, USVirtualKeyCodes } from '../../src/consts/virtual-key-constants.js'; +import { Constants } from '@keymanapp/common-types'; + +import CLDRScanToVkey = Constants.CLDRScanToVkey; +import CLDRScanToKeyMap = Constants.CLDRScanToKeyMap; +import USVirtualKeyCodes = Constants.USVirtualKeyCodes; function pluckKeysFromKeybag(keys: LKKey[], ids: string[]) { return keys.filter(({id}) => ids.indexOf(id) !== -1); diff --git a/common/web/types/test/kpj/test-kpj-file-reader.ts b/developer/src/common/web/utils/test/kpj/test-kpj-file-reader.ts similarity index 97% rename from common/web/types/test/kpj/test-kpj-file-reader.ts rename to developer/src/common/web/utils/test/kpj/test-kpj-file-reader.ts index cbebdd7920..4b154af060 100644 --- a/common/web/types/test/kpj/test-kpj-file-reader.ts +++ b/developer/src/common/web/utils/test/kpj/test-kpj-file-reader.ts @@ -2,9 +2,9 @@ import * as fs from 'fs'; import 'mocha'; import {assert} from 'chai'; import { makePathToFixture } from '../helpers/index.js'; -import { KPJFileReader } from "../../src/kpj/kpj-file-reader.js"; -import { KeymanDeveloperProjectFile10, KeymanDeveloperProjectType } from '../../src/kpj/keyman-developer-project.js'; -import { TestCompilerCallbacks } from '../helpers/TestCompilerCallbacks.js'; +import { KPJFileReader } from "../../src/types/kpj/kpj-file-reader.js"; +import { KeymanDeveloperProjectFile10, KeymanDeveloperProjectType } from '../../src/types/kpj/keyman-developer-project.js'; +import { TestCompilerCallbacks } from '@keymanapp/developer-test-helpers'; const callbacks = new TestCompilerCallbacks(); diff --git a/common/web/types/test/kvk/test-kvk-round-trip.ts b/developer/src/common/web/utils/test/kvks/test-kvk-round-trip.ts similarity index 85% rename from common/web/types/test/kvk/test-kvk-round-trip.ts rename to developer/src/common/web/utils/test/kvks/test-kvk-round-trip.ts index 7211ac3a35..b056bf4eed 100644 --- a/common/web/types/test/kvk/test-kvk-round-trip.ts +++ b/developer/src/common/web/utils/test/kvks/test-kvk-round-trip.ts @@ -5,10 +5,9 @@ import Hexy from 'hexy'; import gitDiff from 'git-diff'; const { hexy } = Hexy; import { makePathToFixture } from '../helpers/index.js'; -import KvksFileReader from "../../src/kvk/kvks-file-reader.js"; -import KvkFileReader from "../../src/kvk/kvk-file-reader.js"; -import KvkFileWriter from "../../src/kvk/kvk-file-writer.js"; -import KvksFileWriter from "../../src/kvk/kvks-file-writer.js"; +import KvksFileReader from "../../src/types/kvks/kvks-file-reader.js"; +import { KvkFileReader, KvkFileWriter } from "@keymanapp/common-types"; +import KvksFileWriter from "../../src/types/kvks/kvks-file-writer.js"; /** * @@ -28,7 +27,7 @@ function assertBufferMatch(actual: Buffer, expected: Buffer) { describe('kvk-file-reader', function () { it('kvk-file-reader should round-trip with kvk-file-writer', function() { - const path = makePathToFixture('kvk', 'khmer_angkor.kvk'); + const path = makePathToFixture('kvks', 'khmer_angkor.kvk'); const input = fs.readFileSync(path); const reader = new KvkFileReader(); const vk = reader.read(input); @@ -44,8 +43,8 @@ describe('kvk-file-reader', function () { describe('kvks-file-reader', function () { it('kvks-file-reader should compile with kvk-file-writer', function() { - const inputPath = makePathToFixture('kvk', 'khmer_angkor.kvks'); - const compiledPath = makePathToFixture('kvk', 'khmer_angkor.kvk'); + const inputPath = makePathToFixture('kvks', 'khmer_angkor.kvks'); + const compiledPath = makePathToFixture('kvks', 'khmer_angkor.kvk'); const input = fs.readFileSync(inputPath); const compiled = fs.readFileSync(compiledPath); const reader = new KvksFileReader(); @@ -63,7 +62,7 @@ describe('kvks-file-reader', function () { describe('kvks-file-writer', function() { it('kvks-file-writer should match what kvk-file-reader reads', function() { - const kvkIn = makePathToFixture('kvk', 'khmer_angkor.kvk'); + const kvkIn = makePathToFixture('kvks', 'khmer_angkor.kvk'); const kvkBuf = fs.readFileSync(kvkIn); const kvkReader = new KvkFileReader(); const kvksReader = new KvksFileReader(); @@ -85,7 +84,7 @@ describe('kvks-file-reader', function () { }); it('should have identical input and output for kvk and kvks', function() { - const path = makePathToFixture('kvk', 'balochi_inpage.kvks'); + const path = makePathToFixture('kvks', 'balochi_inpage.kvks'); const input = fs.readFileSync(path); const reader = new KvksFileReader(); @@ -104,7 +103,7 @@ describe('kvks-file-reader', function () { assert.deepEqual(vk, vkExpected); // Then compare against the .kvk - const kvkPath = makePathToFixture('kvk', 'balochi_inpage.kvk'); + const kvkPath = makePathToFixture('kvks', 'balochi_inpage.kvk'); const kvkInput = fs.readFileSync(kvkPath); const kvkReader = new KvkFileReader(); diff --git a/developer/src/common/web/utils/test/kvks/test-kvk-utils.ts b/developer/src/common/web/utils/test/kvks/test-kvk-utils.ts new file mode 100644 index 0000000000..fe4c626d72 --- /dev/null +++ b/developer/src/common/web/utils/test/kvks/test-kvk-utils.ts @@ -0,0 +1,48 @@ +// NOTE: this is a copy of common/web/types/test/kvk/test-kvk-utils.ts +import 'mocha'; +import {assert} from 'chai'; +import { VisualKeyboard as VK } from "@keymanapp/common-types"; +import VisualKeyboard = VK.VisualKeyboard; +import VisualKeyboardHeaderFlags = VK.VisualKeyboardHeaderFlags; +import VisualKeyboardKeyFlags = VK.VisualKeyboardKeyFlags; +import VisualKeyboardShiftState = VK.VisualKeyboardShiftState; +import { Constants } from '@keymanapp/common-types'; +import USVirtualKeyCodes = Constants.USVirtualKeyCodes; + +export function verify_khmer_angkor(vk: VisualKeyboard) { + assert.equal(vk.header.flags, VisualKeyboardHeaderFlags.kvkhAltGr); + assert.equal(vk.header.associatedKeyboard, 'khmer_angkor'); + assert.equal(vk.header.ansiFont.name, 'Arial'); + assert.equal(vk.header.ansiFont.size, -12); + assert.equal(vk.header.unicodeFont.name, 'Khmer Busra Kbd'); + assert.equal(vk.header.unicodeFont.size, 16); + assert.equal(vk.keys.length, 186); + assert.equal(vk.keys[0].flags, VisualKeyboardKeyFlags.kvkkUnicode); + assert.equal(vk.keys[0].vkey, USVirtualKeyCodes.K_B); + assert.equal(vk.keys[0].shift, VisualKeyboardShiftState.KVKS_RALT); + assert.equal(vk.keys[0].text, 'ឞ'); + assert.equal(vk.keys[185].flags, VisualKeyboardKeyFlags.kvkkUnicode); + assert.equal(vk.keys[185].vkey, USVirtualKeyCodes.K_COMMA); + assert.equal(vk.keys[185].shift, VisualKeyboardShiftState.KVKS_SHIFT); + assert.equal(vk.keys[185].text, ''); +} + +export function verify_balochi_inpage(vk: VisualKeyboard) { + assert.equal(vk.header.flags, + VisualKeyboardHeaderFlags.kvkhAltGr | VisualKeyboardHeaderFlags.kvkhDisplayUnderlying); + assert.equal(vk.header.associatedKeyboard, 'balochi_inpage'); + assert.equal(vk.header.unicodeFont.name, 'Lateef'); + assert.equal(vk.header.unicodeFont.size, 14); + assert.equal(vk.keys.length, 147); + assert.equal(vk.keys[0].flags, VisualKeyboardKeyFlags.kvkkUnicode); + assert.equal(vk.keys[0].vkey, USVirtualKeyCodes.K_BKQUOTE); + assert.equal(vk.keys[0].shift, VisualKeyboardShiftState.KVKS_RALT); + assert.equal(vk.keys[0].text, '‍'); + assert.equal(vk.keys[30].flags, + VisualKeyboardKeyFlags.kvkkUnicode | VisualKeyboardKeyFlags.kvkkBitmap); + assert.equal(vk.keys[30].vkey, USVirtualKeyCodes.K_COMMA); + assert.equal(vk.keys[30].shift, + VisualKeyboardShiftState.KVKS_LCTRL); + assert.equal(vk.keys[30].text, ''); + assert.equal(vk.keys[30].bitmap.byteLength, 35766); +} \ No newline at end of file diff --git a/common/web/types/test/kvk/test-kvks-file.ts b/developer/src/common/web/utils/test/kvks/test-kvks-file.ts similarity index 82% rename from common/web/types/test/kvk/test-kvks-file.ts rename to developer/src/common/web/utils/test/kvks/test-kvks-file.ts index 2cd1a965c6..80851647bd 100644 --- a/common/web/types/test/kvk/test-kvks-file.ts +++ b/developer/src/common/web/utils/test/kvks/test-kvks-file.ts @@ -1,14 +1,14 @@ import * as fs from 'fs'; import 'mocha'; import { makePathToFixture } from '../helpers/index.js'; -import KvksFileReader from "../../src/kvk/kvks-file-reader.js"; -import KvksFileWriter from "../../src/kvk/kvks-file-writer.js"; +import KvksFileReader from "../../src/types/kvks/kvks-file-reader.js"; +import KvksFileWriter from "../../src/types/kvks/kvks-file-writer.js"; import { verify_khmer_angkor, verify_balochi_inpage } from './test-kvk-utils.js'; import { assert } from 'chai'; describe('kvks-file-reader', function() { it('should read a valid file', function() { - const path = makePathToFixture('kvk', 'khmer_angkor.kvks'); + const path = makePathToFixture('kvks', 'khmer_angkor.kvks'); const input = fs.readFileSync(path); const reader = new KvksFileReader(); @@ -23,7 +23,7 @@ describe('kvks-file-reader', function() { }); it('should read a valid file with bitmaps', function() { - const path = makePathToFixture('kvk', 'balochi_inpage.kvks'); + const path = makePathToFixture('kvks', 'balochi_inpage.kvks'); const input = fs.readFileSync(path); const reader = new KvksFileReader(); const kvks = reader.read(input); @@ -34,7 +34,7 @@ describe('kvks-file-reader', function() { }); it('should give a sensible error on a .kvk file', function() { - const path = makePathToFixture('kvk', 'khmer_angkor.kvk'); + const path = makePathToFixture('kvks', 'khmer_angkor.kvk'); const input = fs.readFileSync(path); const reader = new KvksFileReader(); @@ -44,7 +44,7 @@ describe('kvks-file-reader', function() { describe('kvks-file-writer', function() { it('should write a valid file', function() { - const path = makePathToFixture('kvk', 'khmer_angkor.kvks'); + const path = makePathToFixture('kvks', 'khmer_angkor.kvks'); const input = fs.readFileSync(path); const reader = new KvksFileReader(); diff --git a/developer/src/common/web/utils/test/test-license.ts b/developer/src/common/web/utils/test/test-license.ts index 653f89ba69..501f4f4711 100644 --- a/developer/src/common/web/utils/test/test-license.ts +++ b/developer/src/common/web/utils/test/test-license.ts @@ -2,7 +2,7 @@ import * as fs from 'fs'; import { assert } from 'chai'; import 'mocha'; import { makePathToFixture } from './helpers/index.js'; -import { validateMITLicense } from '../src/validate-mit-license.js'; +import { validateMITLicense } from '../src/utils/validate-mit-license.js'; function verifyLicenseFile(filename: string) { return validateMITLicense(fs.readFileSync(makePathToFixture('license', filename), 'utf-8')); diff --git a/developer/src/common/web/utils/tsconfig.json b/developer/src/common/web/utils/tsconfig.json index c5980c82f9..3be972dbcb 100644 --- a/developer/src/common/web/utils/tsconfig.json +++ b/developer/src/common/web/utils/tsconfig.json @@ -7,7 +7,7 @@ "baseUrl": ".", }, "include": [ - "index.ts", "src/**/*.ts", + "src/deps/xml2js/*.js", ], } \ No newline at end of file diff --git a/developer/src/kmc-analyze/src/analyzer-messages.ts b/developer/src/kmc-analyze/src/analyzer-messages.ts index 4cf6b83273..1e4204595e 100644 --- a/developer/src/kmc-analyze/src/analyzer-messages.ts +++ b/developer/src/kmc-analyze/src/analyzer-messages.ts @@ -1,8 +1,7 @@ /// // above is required for now, seemingly https://github.com/microsoft/TypeScript/issues/42873 // probably addressed in ts 5.5.2 -import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m, CompilerMessageDef as def, CompilerMessageSpecWithException } from "@keymanapp/common-types"; -import { KeymanUrls } from "@keymanapp/developer-utils"; +import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m, CompilerMessageDef as def, CompilerMessageSpecWithException, KeymanUrls } from "@keymanapp/developer-utils"; const Namespace = CompilerErrorNamespace.Analyzer; const SevInfo = CompilerErrorSeverity.Info | Namespace; diff --git a/developer/src/kmc-analyze/src/osk-character-use/index.ts b/developer/src/kmc-analyze/src/osk-character-use/index.ts index 86585ba961..36fbf0e78c 100644 --- a/developer/src/kmc-analyze/src/osk-character-use/index.ts +++ b/developer/src/kmc-analyze/src/osk-character-use/index.ts @@ -1,6 +1,6 @@ -import { CompilerCallbacks, KeymanFileTypes, KvksFile, KvksFileReader, TouchLayout, TouchLayoutFileReader } from "@keymanapp/common-types"; +import { KeymanFileTypes, TouchLayout } from "@keymanapp/common-types"; import { KmnCompilerMessages, Osk } from '@keymanapp/kmc-kmn'; -import { escapeMarkdownChar } from '@keymanapp/developer-utils'; +import { CompilerCallbacks, escapeMarkdownChar, KvksFile, KvksFileReader, TouchLayoutFileReader } from '@keymanapp/developer-utils'; import { getOskFromKmnFile } from "../util/get-osk-from-kmn-file.js"; import { AnalyzerMessages } from "../analyzer-messages.js"; diff --git a/developer/src/kmc-analyze/src/osk-rewrite-pua/index.ts b/developer/src/kmc-analyze/src/osk-rewrite-pua/index.ts index fdc5143a30..dc56ebfb3a 100644 --- a/developer/src/kmc-analyze/src/osk-rewrite-pua/index.ts +++ b/developer/src/kmc-analyze/src/osk-rewrite-pua/index.ts @@ -1,4 +1,5 @@ -import { CompilerCallbacks, KeymanFileTypes, KvksFile, KvksFileReader, KvksFileWriter, TouchLayoutFileReader, TouchLayoutFileWriter } from "@keymanapp/common-types"; +import { KeymanFileTypes } from "@keymanapp/common-types"; +import { CompilerCallbacks, KvksFile, KvksFileReader, KvksFileWriter, TouchLayoutFileReader, TouchLayoutFileWriter } from '@keymanapp/developer-utils'; import { KmnCompilerMessages, Osk } from '@keymanapp/kmc-kmn'; import { getOskFromKmnFile } from "../util/get-osk-from-kmn-file.js"; import { AnalyzerMessages } from "../analyzer-messages.js"; diff --git a/developer/src/kmc-analyze/src/util/get-osk-from-kmn-file.ts b/developer/src/kmc-analyze/src/util/get-osk-from-kmn-file.ts index 0e2ec28995..b9fd9cb602 100644 --- a/developer/src/kmc-analyze/src/util/get-osk-from-kmn-file.ts +++ b/developer/src/kmc-analyze/src/util/get-osk-from-kmn-file.ts @@ -1,4 +1,5 @@ -import { CompilerCallbacks, KMX, KmxFileReader } from "@keymanapp/common-types"; +import { KMX, KmxFileReader } from "@keymanapp/common-types"; +import { CompilerCallbacks } from "@keymanapp/developer-utils"; import { KmnCompiler } from "@keymanapp/kmc-kmn"; export async function getOskFromKmnFile(callbacks: CompilerCallbacks, filename: string): Promise<{ diff --git a/developer/src/kmc-keyboard-info/src/keyboard-info-compiler-messages.ts b/developer/src/kmc-keyboard-info/src/keyboard-info-compiler-messages.ts index d1a4c632c0..bf5d989718 100644 --- a/developer/src/kmc-keyboard-info/src/keyboard-info-compiler-messages.ts +++ b/developer/src/kmc-keyboard-info/src/keyboard-info-compiler-messages.ts @@ -1,4 +1,4 @@ -import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m, CompilerMessageDef as def, CompilerMessageSpecWithException } from "@keymanapp/common-types"; +import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m, CompilerMessageDef as def, CompilerMessageSpecWithException } from "@keymanapp/developer-utils"; const Namespace = CompilerErrorNamespace.KeyboardInfoCompiler; // const SevInfo = CompilerErrorSeverity.Info | Namespace; @@ -52,8 +52,14 @@ export class KeyboardInfoCompilerMessages { static Error_FontFileCannotBeRead = (o:{filename: string}) => m(this.ERROR_FontFileCannotBeRead, `Font ${def(o.filename)} could not be parsed to extract a font family.`); -static ERROR_FontFileMetaDataIsInvalid = SevError | 0x000F; -static Error_FontFileMetaDataIsInvalid = (o:{filename: string,message:string}) => m(this.ERROR_FontFileMetaDataIsInvalid, + static ERROR_FontFileMetaDataIsInvalid = SevError | 0x000F; + static Error_FontFileMetaDataIsInvalid = (o:{filename: string,message:string}) => m( + this.ERROR_FontFileMetaDataIsInvalid, `Font ${def(o.filename)} meta data invalid: ${def(o.message)}.`); + + static ERROR_DescriptionIsMissing = SevError | 0x0010; + static Error_DescriptionIsMissing = (o:{filename:string}) => m( + this.ERROR_DescriptionIsMissing, + `The Info.Description field in the package ${def(o.filename)} is required, but is missing or empty.`); } diff --git a/developer/src/kmc-keyboard-info/src/keyboard-info-compiler.ts b/developer/src/kmc-keyboard-info/src/keyboard-info-compiler.ts index f829734ccc..8e89bb8164 100644 --- a/developer/src/kmc-keyboard-info/src/keyboard-info-compiler.ts +++ b/developer/src/kmc-keyboard-info/src/keyboard-info-compiler.ts @@ -5,10 +5,10 @@ import { minKeymanVersion } from "./min-keyman-version.js"; import { KeyboardInfoFile, KeyboardInfoFileIncludes, KeyboardInfoFileLanguageFont, KeyboardInfoFilePlatform } from "./keyboard-info-file.js"; -import { KeymanFileTypes, CompilerCallbacks, KmpJsonFile, KmxFileReader, KMX, KeymanTargets, KeymanCompiler, CompilerOptions, KeymanCompilerResult, KeymanCompilerArtifacts, KeymanCompilerArtifact } from "@keymanapp/common-types"; +import { KeymanFileTypes, KmpJsonFile, KmxFileReader, KMX, KeymanTargets } from "@keymanapp/common-types"; import { KeyboardInfoCompilerMessages } from "./keyboard-info-compiler-messages.js"; import langtags from "./imports/langtags.js"; -import { KeymanUrls, isValidEmail, validateMITLicense } from "@keymanapp/developer-utils"; +import { CompilerCallbacks, KeymanCompiler, CompilerOptions, KeymanCompilerResult, KeymanCompilerArtifacts, KeymanCompilerArtifact, KeymanUrls, isValidEmail, validateMITLicense } from "@keymanapp/developer-utils"; import { KmpCompiler } from "@keymanapp/kmc-package"; import { SchemaValidators } from "@keymanapp/common-types"; @@ -251,6 +251,9 @@ export class KeyboardInfoCompiler implements KeymanCompiler { if(kmpJsonData.info.description?.description) { keyboard_info.description = kmpJsonData.info.description.description.trim(); + } else { + this.callbacks.reportMessage(KeyboardInfoCompilerMessages.Error_DescriptionIsMissing({filename:sources.kpsFilename})); + return null; } // extract the language identifiers from the language metadata arrays for diff --git a/developer/src/kmc-keyboard-info/test/test-keyboard-info-compiler-messages.ts b/developer/src/kmc-keyboard-info/test/test-keyboard-info-compiler-messages.ts index 2d205f8f47..2bf73b7dd3 100644 --- a/developer/src/kmc-keyboard-info/test/test-keyboard-info-compiler-messages.ts +++ b/developer/src/kmc-keyboard-info/test/test-keyboard-info-compiler-messages.ts @@ -2,7 +2,8 @@ import { assert } from 'chai'; import 'mocha'; import { KeyboardInfoCompilerMessages } from '../src/keyboard-info-compiler-messages.js'; import { TestCompilerCallbacks, verifyCompilerMessagesObject } from '@keymanapp/developer-test-helpers'; -import { CompilerErrorNamespace, KmpJsonFile, KeymanFileTypes } from '@keymanapp/common-types'; +import { KmpJsonFile, KeymanFileTypes } from '@keymanapp/common-types'; +import { CompilerErrorNamespace } from '@keymanapp/developer-utils'; import { makePathToFixture } from './helpers/index.js'; import { KeyboardInfoCompiler, KeyboardInfoCompilerResult } from '../src/keyboard-info-compiler.js'; import { KeyboardInfoFile } from '../src/keyboard-info-file.js'; diff --git a/developer/src/kmc-keyboard-info/test/test-keyboard-info-compiler.ts b/developer/src/kmc-keyboard-info/test/test-keyboard-info-compiler.ts index f857c5d896..99c244be2d 100644 --- a/developer/src/kmc-keyboard-info/test/test-keyboard-info-compiler.ts +++ b/developer/src/kmc-keyboard-info/test/test-keyboard-info-compiler.ts @@ -6,7 +6,8 @@ import { makePathToFixture } from './helpers/index.js'; import { KeyboardInfoCompiler, KeyboardInfoCompilerResult, unitTestEndpoints } from '../src/keyboard-info-compiler.js'; import langtags from "../src/imports/langtags.js"; import { KmpCompiler, KmpCompilerOptions } from '@keymanapp/kmc-package'; -import { CompilerCallbacks, KMX, KeymanFileTypes, KeymanTargets, KmpJsonFile } from '@keymanapp/common-types'; +import { KMX, KeymanFileTypes, KeymanTargets, KmpJsonFile } from '@keymanapp/common-types'; +import { CompilerCallbacks } from '@keymanapp/developer-utils'; import { KeyboardInfoFile, KeyboardInfoFileLanguage, KeyboardInfoFilePlatform } from './keyboard-info-file.js'; const callbacks = new TestCompilerCallbacks(); @@ -834,17 +835,4 @@ describe('keyboard-info-compiler', function () { const result = await compiler['fontSourceToKeyboardInfoFont'](KHMER_ANGKOR_KPS, kmpJsonData, fonts); assert.deepEqual(result, KHMER_ANGKOR_DISPLAY_FONT_INFO); }); - - it('handles missing info.version in a package file', async function() { - const sources = { - ...KHMER_ANGKOR_SOURCES, - kpsFilename: makePathToFixture('missing-info-version-in-kps-11856', 'khmer_angkor.kps') - }; - const compiler = new KeyboardInfoCompiler(); - assert.isTrue(await compiler.init(callbacks, {sources})); - const kpjFilename = KHMER_ANGKOR_KPJ; - const result = await compiler.run(kpjFilename); - const actual = JSON.parse(new TextDecoder().decode(result.artifacts.keyboard_info.data)); - assert.equal(actual.version, '1.0'); - }); }); diff --git a/developer/src/kmc-kmn/src/compiler/compiler.ts b/developer/src/kmc-kmn/src/compiler/compiler.ts index f8938be60e..afb980e2fc 100644 --- a/developer/src/kmc-kmn/src/compiler/compiler.ts +++ b/developer/src/kmc-kmn/src/compiler/compiler.ts @@ -6,8 +6,11 @@ TODO: implement additional interfaces: */ // TODO: rename wasm-host? -import { UnicodeSetParser, UnicodeSet, VisualKeyboard, KvkFileReader, KeymanCompiler, KeymanCompilerArtifacts, KeymanCompilerArtifactOptional, KeymanCompilerResult, KeymanCompilerArtifact } from '@keymanapp/common-types'; -import { CompilerCallbacks, CompilerEvent, CompilerOptions, KeymanFileTypes, KvkFileWriter, KvksFileReader } from '@keymanapp/common-types'; +import { VisualKeyboard, KvkFileReader, UnicodeSetParser, UnicodeSet, KeymanFileTypes, KvkFileWriter } from '@keymanapp/common-types'; +import { + CompilerCallbacks, CompilerEvent, CompilerOptions, KeymanCompiler, KeymanCompilerArtifacts, + KeymanCompilerArtifactOptional, KeymanCompilerResult, KeymanCompilerArtifact, KvksFileReader +} from '@keymanapp/developer-utils'; import * as Osk from './osk.js'; import loadWasmHost from '../import/kmcmplib/wasm-host.js'; import { KmnCompilerMessages } from './kmn-compiler-messages.js'; diff --git a/developer/src/kmc-kmn/src/compiler/kmn-compiler-messages.ts b/developer/src/kmc-kmn/src/compiler/kmn-compiler-messages.ts index d40da3f492..8d2d4c88ea 100644 --- a/developer/src/kmc-kmn/src/compiler/kmn-compiler-messages.ts +++ b/developer/src/kmc-kmn/src/compiler/kmn-compiler-messages.ts @@ -1,6 +1,5 @@ -import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerEvent, CompilerMessageSpec as m, CompilerMessageDef as def, CompilerMessageSpecWithException } from "@keymanapp/common-types"; import { kmnfile } from "../kmw-compiler/compiler-globals.js"; -import { KeymanUrls } from "@keymanapp/developer-utils"; +import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerEvent, CompilerMessageSpec as m, CompilerMessageDef as def, CompilerMessageSpecWithException, KeymanUrls } from "@keymanapp/developer-utils"; const Namespace = CompilerErrorNamespace.KmnCompiler; const SevInfo = CompilerErrorSeverity.Info | Namespace; diff --git a/developer/src/kmc-kmn/src/kmw-compiler/compiler-globals.ts b/developer/src/kmc-kmn/src/kmw-compiler/compiler-globals.ts index 520c468b3a..a8c1e1b72c 100644 --- a/developer/src/kmc-kmn/src/kmw-compiler/compiler-globals.ts +++ b/developer/src/kmc-kmn/src/kmw-compiler/compiler-globals.ts @@ -1,4 +1,5 @@ -import { KMX, CompilerCallbacks, CompilerOptions } from "@keymanapp/common-types"; +import { KMX } from "@keymanapp/common-types"; +import { CompilerCallbacks, CompilerOptions } from "@keymanapp/developer-utils"; import { KmnCompilerResult } from "../compiler/compiler.js"; export let FTabStop: string; diff --git a/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler-messages.ts b/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler-messages.ts index 448b6bd6ac..5170a8d678 100644 --- a/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler-messages.ts +++ b/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler-messages.ts @@ -1,5 +1,5 @@ import { KmnCompilerMessages } from "../compiler/kmn-compiler-messages.js"; -import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerEvent, CompilerMessageDef as def, CompilerMessageSpec } from "@keymanapp/common-types"; +import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerEvent, CompilerMessageDef as def, CompilerMessageSpec } from "@keymanapp/developer-utils"; import { kmnfile } from "./compiler-globals.js"; const Namespace = CompilerErrorNamespace.KmwCompiler; diff --git a/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler.ts b/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler.ts index 65f2111ecf..5dcde400ea 100644 --- a/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler.ts +++ b/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler.ts @@ -1,4 +1,5 @@ -import { KMX, CompilerOptions, CompilerCallbacks, KvkFileReader, VisualKeyboard, KmxFileReader, KvkFile } from "@keymanapp/common-types"; +import { KMX, KvkFileReader, VisualKeyboard, KmxFileReader, KvkFile } from "@keymanapp/common-types"; +import { CompilerOptions, CompilerCallbacks } from "@keymanapp/developer-utils"; import { ExpandSentinel, incxstr, xstrlen } from "./util.js"; import { options, nl, FTabStop, setupGlobals, callbacks, FFix183_LadderLength, FCallFunctions, fk, minimumKeymanVersionToString, isKeyboardVersion10OrLater, isKeyboardVersion17OrLater } from "./compiler-globals.js"; import { JavaScript_ContextMatch, JavaScript_KeyAsString, JavaScript_Name, JavaScript_OutputString, JavaScript_Rules, JavaScript_Shift, JavaScript_ShiftAsString, JavaScript_Store, zeroPadHex } from './javascript-strings.js'; diff --git a/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts b/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts index 7432204cb1..61d0985f87 100644 --- a/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts +++ b/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts @@ -1,4 +1,5 @@ -import { KMX, TouchLayout, TouchLayoutFileReader, TouchLayoutFileWriter } from "@keymanapp/common-types"; +import { KMX, TouchLayout } from "@keymanapp/common-types"; +import { TouchLayoutFileReader, TouchLayoutFileWriter } from "@keymanapp/developer-utils"; import { callbacks, minimumKeymanVersion, verifyAndSetMinimumRequiredKeymanVersion15, isKeyboardVersion14OrLater, isKeyboardVersion17OrLater, verifyAndSetMinimumRequiredKeymanVersion14, diff --git a/developer/src/kmc-kmn/test/kmw/test-kmw-compiler.ts b/developer/src/kmc-kmn/test/kmw/test-kmw-compiler.ts index 3e9cbaba87..37a58384b2 100644 --- a/developer/src/kmc-kmn/test/kmw/test-kmw-compiler.ts +++ b/developer/src/kmc-kmn/test/kmw/test-kmw-compiler.ts @@ -229,7 +229,7 @@ async function run_test_keyboard(kmnCompiler: KmnCompiler, id: string): fs.writeFileSync(filenames.binary, value.actualCode); } - assert.deepEqual(value.actual.js, value.expected.js); + assert.deepEqual(value.actual.js.replaceAll(/\r\n/g, '\n'), value.expected.js.replaceAll(/\r\n/g, '\n')); assert.deepEqual(JSON.parse(value.actual.touchLayout), JSON.parse(value.expected.touchLayout)); return value; diff --git a/developer/src/kmc-kmn/test/kmw/test-kmw-messages.ts b/developer/src/kmc-kmn/test/kmw/test-kmw-messages.ts index 2021f6787b..20a1a5c83b 100644 --- a/developer/src/kmc-kmn/test/kmw/test-kmw-messages.ts +++ b/developer/src/kmc-kmn/test/kmw/test-kmw-messages.ts @@ -4,7 +4,7 @@ import { KmwCompilerMessages } from '../../src/kmw-compiler/kmw-compiler-message import { TestCompilerCallbacks, verifyCompilerMessagesObject } from '@keymanapp/developer-test-helpers'; import { makePathToFixture } from '../helpers/index.js'; import { KmnCompiler } from '../../src/main.js'; -import { CompilerErrorNamespace } from '@keymanapp/common-types'; +import { CompilerErrorNamespace } from '@keymanapp/developer-utils'; describe('KmwCompilerMessages', function () { const callbacks = new TestCompilerCallbacks(); diff --git a/developer/src/kmc-kmn/test/test-messages.ts b/developer/src/kmc-kmn/test/test-messages.ts index ea697a0174..0c3f17a58c 100644 --- a/developer/src/kmc-kmn/test/test-messages.ts +++ b/developer/src/kmc-kmn/test/test-messages.ts @@ -4,7 +4,7 @@ import { KmnCompilerMessageRanges, KmnCompilerMessages } from '../src/compiler/k import { TestCompilerCallbacks, verifyCompilerMessagesObject } from '@keymanapp/developer-test-helpers'; import { makePathToFixture } from './helpers/index.js'; import { KmnCompiler } from '../src/main.js'; -import { CompilerErrorMask, CompilerErrorNamespace } from '@keymanapp/common-types'; +import { CompilerErrorMask, CompilerErrorNamespace } from '@keymanapp/developer-utils'; describe('KmnCompilerMessages', function () { const callbacks = new TestCompilerCallbacks(); diff --git a/developer/src/kmc-kmn/test/test-wasm-uset.ts b/developer/src/kmc-kmn/test/test-wasm-uset.ts index 7c25513651..ad67b35246 100644 --- a/developer/src/kmc-kmn/test/test-wasm-uset.ts +++ b/developer/src/kmc-kmn/test/test-wasm-uset.ts @@ -3,7 +3,7 @@ import { assert } from 'chai'; import { KmnCompiler } from '../src/main.js'; import { TestCompilerCallbacks } from '@keymanapp/developer-test-helpers'; import { KmnCompilerMessages } from '../src/compiler/kmn-compiler-messages.js'; -import { compilerErrorFormatCode } from '@keymanapp/common-types'; +import { compilerErrorFormatCode } from '@keymanapp/developer-utils'; describe('Compiler UnicodeSet function', function() { it('should fixup "short" \\u{} escapes', function () { diff --git a/developer/src/kmc-ldml/build.sh b/developer/src/kmc-ldml/build.sh index 41b5e49478..73a40c79d7 100755 --- a/developer/src/kmc-ldml/build.sh +++ b/developer/src/kmc-ldml/build.sh @@ -14,6 +14,7 @@ builder_describe "Keyman kmc Keyboard Compiler module" \ "@/common/web/keyman-version" \ "@/common/web/types" \ "@/developer/src/kmc-kmn" \ + "@/developer/src/common/web/utils" \ "@/developer/src/common/web/test-helpers" \ "configure" \ "build" \ diff --git a/developer/src/kmc-ldml/package.json b/developer/src/kmc-ldml/package.json index ef1a17bd68..6f65eaf0e0 100644 --- a/developer/src/kmc-ldml/package.json +++ b/developer/src/kmc-ldml/package.json @@ -26,9 +26,10 @@ }, "dependencies": { "@keymanapp/keyman-version": "*", + "@keymanapp/developer-utils": "*", "@keymanapp/kmc-kmn": "*", "@keymanapp/ldml-keyboard-constants": "*", - "semver": "^7.5.2" + "semver": "^7.5.4" }, "devDependencies": { "@keymanapp/developer-test-helpers": "*", diff --git a/developer/src/kmc-ldml/src/compiler/compiler.ts b/developer/src/kmc-ldml/src/compiler/compiler.ts index 59ed5f9a07..950534e69c 100644 --- a/developer/src/kmc-ldml/src/compiler/compiler.ts +++ b/developer/src/kmc-ldml/src/compiler/compiler.ts @@ -1,4 +1,10 @@ -import { LDMLKeyboardXMLSourceFileReader, LDMLKeyboard, KMXPlus, CompilerCallbacks, LDMLKeyboardTestDataXMLSourceFile, UnicodeSetParser, KeymanCompiler, KeymanCompilerResult, KeymanCompilerArtifacts, defaultCompilerOptions, KMXBuilder, KvkFileWriter, KeymanCompilerArtifactOptional } from '@keymanapp/common-types'; +import { KMXPlus, UnicodeSetParser, KvkFileWriter } from '@keymanapp/common-types'; +import { + CompilerCallbacks, KeymanCompiler, KeymanCompilerResult, KeymanCompilerArtifacts, + defaultCompilerOptions, LDMLKeyboardXMLSourceFileReader, LDMLKeyboard, + LDMLKeyboardTestDataXMLSourceFile, KMXBuilder, + KeymanCompilerArtifactOptional +} from "@keymanapp/developer-utils"; import { LdmlCompilerOptions } from './ldml-compiler-options.js'; import { LdmlCompilerMessages } from './ldml-compiler-messages.js'; import { BkspCompiler, TranCompiler } from './tran.js'; @@ -99,7 +105,7 @@ export class LdmlKeyboardCompiler implements KeymanCompiler { * @returns false if initialization fails */ async init(callbacks: CompilerCallbacks, options: LdmlCompilerOptions): Promise { - this.options = {...options}; + this.options = { ...options }; this.callbacks = callbacks; return true; } @@ -178,15 +184,15 @@ export class LdmlKeyboardCompiler implements KeymanCompiler { * @returns true on success */ async write(artifacts: LdmlKeyboardCompilerArtifacts): Promise { - if(artifacts.kmx) { + if (artifacts.kmx) { this.callbacks.fs.writeFileSync(artifacts.kmx.filename, artifacts.kmx.data); } - if(artifacts.kvk) { + if (artifacts.kvk) { this.callbacks.fs.writeFileSync(artifacts.kvk.filename, artifacts.kvk.data); } - if(artifacts.js) { + if (artifacts.js) { this.callbacks.fs.writeFileSync(artifacts.js.filename, artifacts.js.data); } @@ -198,7 +204,7 @@ export class LdmlKeyboardCompiler implements KeymanCompiler { * Construct or return a UnicodeSetParser, aka KmnCompiler * @returns the held UnicodeSetParser */ - async getUsetParser() : Promise { + async getUsetParser(): Promise { if (this.usetparser === undefined) { // initialize const compiler = new KmnCompiler(); @@ -228,14 +234,14 @@ export class LdmlKeyboardCompiler implements KeymanCompiler { const reader = new LDMLKeyboardXMLSourceFileReader(this.options.readerOptions, this.callbacks); // load the file from disk into a string const data = this.callbacks.loadFile(filename); - if(!data) { - this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidFile({errorText: 'Unable to read XML file'})); + if (!data) { + this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidFile({ errorText: 'Unable to read XML file' })); return null; } // parse (load) the string into an object tree const source = reader.load(data); - if(!source) { - this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidFile({errorText: 'Unable to load XML file'})); + if (!source) { + this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidFile({ errorText: 'Unable to load XML file' })); return null; } try { @@ -243,8 +249,8 @@ export class LdmlKeyboardCompiler implements KeymanCompiler { if (!reader.validate(source)) { return null; } - } catch(e) { - this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidFile({errorText: e.toString()})); + } catch (e) { + this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidFile({ errorText: e.toString() })); return null; } @@ -261,14 +267,14 @@ export class LdmlKeyboardCompiler implements KeymanCompiler { public loadTestData(filename: string): LDMLKeyboardTestDataXMLSourceFile | null { const reader = new LDMLKeyboardXMLSourceFileReader(this.options.readerOptions, this.callbacks); const data = this.callbacks.loadFile(filename); - if(!data) { - this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidFile({errorText: 'Unable to read XML file'})); + if (!data) { + this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidFile({ errorText: 'Unable to read XML file' })); return null; } const source = reader.loadTestData(data); /* c8 ignore next 4 */ - if(!source) { - this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidFile({errorText: 'Unable to load XML file'})); + if (!source) { + this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidFile({ errorText: 'Unable to load XML file' })); return null; } // TODO-LDML: The unboxed data doesn't match the schema anymore. Skipping validation, for now. @@ -291,10 +297,14 @@ export class LdmlKeyboardCompiler implements KeymanCompiler { } /** - * Runs any linter steps + * Runs any linter steps, adding hints to the callbacks as needed * @internal + * @returns true unless there was a linter failure. */ - private async lint(source: LDMLKeyboardXMLSourceFile, kmx: KMXPlus.KMXPlusFile) : Promise { + private async lint(source: LDMLKeyboardXMLSourceFile, kmx: KMXPlus.KMXPlusFile): Promise { + if (!kmx || !source) { + return false; + } // run each of the linters for (const linter of this.buildLinters(source, kmx)) { if (!await linter.lint()) { @@ -319,12 +329,7 @@ export class LdmlKeyboardCompiler implements KeymanCompiler { } // Run the linters - if (!await this.lint(source, kmx)) { - return false; - } - - // We are valid if we have a keyboard file at this point. - return !!kmx; + return (await this.lint(source, kmx)); } /** @@ -340,8 +345,8 @@ export class LdmlKeyboardCompiler implements KeymanCompiler { const kmx = new KMXPlusFile(); - for(let section of sections) { - if(!section.validate()) { + for (let section of sections) { + if (!section.validate()) { // TODO-LDML: coverage passed = false; // We'll keep validating other sections anyway, so we get a full set of @@ -349,13 +354,13 @@ export class LdmlKeyboardCompiler implements KeymanCompiler { continue; } // clone - const globalSections : DependencySections = Object.assign({}, kmx.kmxplus); + const globalSections: DependencySections = Object.assign({}, kmx.kmxplus); // pre-initialize the usetparser globalSections.usetparser = await this.getUsetParser(); const dependencies = section.dependencies; let dependencyProblem = false; - Object.keys(constants.section).forEach((sectstr : string) => { - const sectid : SectionIdent = constants.section[sectstr]; + Object.keys(constants.section).forEach((sectstr: string) => { + const sectid: SectionIdent = constants.section[sectstr]; if (dependencies.has(sectid)) { /* c8 ignore next 4 */ if (!kmx.kmxplus[sectid]) { @@ -379,12 +384,12 @@ export class LdmlKeyboardCompiler implements KeymanCompiler { } const sect = section.compile(globalSections); - if(!sect) { + if (!sect) { passed = false; continue; } /* c8 ignore next 4 */ - if(kmx.kmxplus[section.id]) { + if (kmx.kmxplus[section.id]) { // Internal error useful during section bring-up throw new Error(`Internal error: section ${section.id} would be assigned twice`); } @@ -393,8 +398,8 @@ export class LdmlKeyboardCompiler implements KeymanCompiler { // give all sections a chance to postValidate if (postValidate) { - for(let section of sections) { - if(!section.postValidate(kmx.kmxplus[section.id])) { + for (let section of sections) { + if (!section.postValidate(kmx.kmxplus[section.id])) { passed = false; } } diff --git a/developer/src/kmc-ldml/src/compiler/disp.ts b/developer/src/kmc-ldml/src/compiler/disp.ts index 769a1a1788..03c411ce8d 100644 --- a/developer/src/kmc-ldml/src/compiler/disp.ts +++ b/developer/src/kmc-ldml/src/compiler/disp.ts @@ -1,5 +1,6 @@ import { constants } from "@keymanapp/ldml-keyboard-constants"; -import { KMXPlus, LDMLKeyboard } from '@keymanapp/common-types'; +import { LDMLKeyboard } from '@keymanapp/developer-utils'; +import { KMXPlus } from "@keymanapp/common-types"; import { LdmlCompilerMessages } from "./ldml-compiler-messages.js"; import { SectionCompiler } from "./section-compiler.js"; diff --git a/developer/src/kmc-ldml/src/compiler/empty-compiler.ts b/developer/src/kmc-ldml/src/compiler/empty-compiler.ts index 78dc771ff6..92c364e4dc 100644 --- a/developer/src/kmc-ldml/src/compiler/empty-compiler.ts +++ b/developer/src/kmc-ldml/src/compiler/empty-compiler.ts @@ -1,6 +1,7 @@ import { SectionIdent, constants } from '@keymanapp/ldml-keyboard-constants'; import { SectionCompiler } from "./section-compiler.js"; -import { util, LDMLKeyboard, KMXPlus, CompilerCallbacks, MarkerParser } from "@keymanapp/common-types"; +import { util, KMXPlus, MarkerParser } from "@keymanapp/common-types"; +import { CompilerCallbacks, LDMLKeyboard } from "@keymanapp/developer-utils"; import { VarsCompiler } from './vars.js'; import { LdmlCompilerMessages } from './ldml-compiler-messages.js'; diff --git a/developer/src/kmc-ldml/src/compiler/keymanweb-compiler.ts b/developer/src/kmc-ldml/src/compiler/keymanweb-compiler.ts index a35739247b..86402b6d45 100644 --- a/developer/src/kmc-ldml/src/compiler/keymanweb-compiler.ts +++ b/developer/src/kmc-ldml/src/compiler/keymanweb-compiler.ts @@ -1,4 +1,5 @@ -import { CompilerCallbacks, VisualKeyboard, LDMLKeyboard, TouchLayoutFileWriter, KeymanFileTypes } from "@keymanapp/common-types"; +import { VisualKeyboard, KeymanFileTypes } from "@keymanapp/common-types"; +import { CompilerCallbacks, LDMLKeyboard, TouchLayoutFileWriter } from "@keymanapp/developer-utils"; import { LdmlCompilerOptions } from "./ldml-compiler-options.js"; import { TouchLayoutCompiler } from "./touch-layout-compiler.js"; import { LdmlKeyboardVisualKeyboardCompiler } from "./visual-keyboard-compiler.js"; diff --git a/developer/src/kmc-ldml/src/compiler/keys.ts b/developer/src/kmc-ldml/src/compiler/keys.ts index 9e5de13246..e341f3ac87 100644 --- a/developer/src/kmc-ldml/src/compiler/keys.ts +++ b/developer/src/kmc-ldml/src/compiler/keys.ts @@ -1,5 +1,6 @@ import { SectionIdent, constants } from '@keymanapp/ldml-keyboard-constants'; -import { LDMLKeyboard, KMXPlus, Constants } from '@keymanapp/common-types'; +import { KMXPlus, Constants } from '@keymanapp/common-types'; +import { LDMLKeyboard } from '@keymanapp/developer-utils'; import { LdmlCompilerMessages } from './ldml-compiler-messages.js'; import { SectionCompiler } from "./section-compiler.js"; diff --git a/developer/src/kmc-ldml/src/compiler/ldml-compiler-messages.ts b/developer/src/kmc-ldml/src/compiler/ldml-compiler-messages.ts index 2d6aa07415..1b6752bdee 100644 --- a/developer/src/kmc-ldml/src/compiler/ldml-compiler-messages.ts +++ b/developer/src/kmc-ldml/src/compiler/ldml-compiler-messages.ts @@ -1,4 +1,5 @@ -import { util, CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m, CompilerMessageDef as def } from "@keymanapp/common-types"; +import { util } from "@keymanapp/common-types"; +import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m, CompilerMessageDef as def } from '@keymanapp/developer-utils'; // const SevInfo = CompilerErrorSeverity.Info | CompilerErrorNamespace.LdmlKeyboardCompiler; const SevHint = CompilerErrorSeverity.Hint | CompilerErrorNamespace.LdmlKeyboardCompiler; const SevWarn = CompilerErrorSeverity.Warn | CompilerErrorNamespace.LdmlKeyboardCompiler; diff --git a/developer/src/kmc-ldml/src/compiler/ldml-compiler-options.ts b/developer/src/kmc-ldml/src/compiler/ldml-compiler-options.ts index 9ea0f043bb..1b4f72113c 100644 --- a/developer/src/kmc-ldml/src/compiler/ldml-compiler-options.ts +++ b/developer/src/kmc-ldml/src/compiler/ldml-compiler-options.ts @@ -1,4 +1,4 @@ -import { CompilerOptions, LDMLKeyboardXMLSourceFileReaderOptions } from "@keymanapp/common-types"; +import { CompilerOptions, LDMLKeyboardXMLSourceFileReaderOptions } from "@keymanapp/developer-utils"; /** * @public diff --git a/developer/src/kmc-ldml/src/compiler/linter.ts b/developer/src/kmc-ldml/src/compiler/linter.ts index 2a74dfd0b5..f01d4bd841 100644 --- a/developer/src/kmc-ldml/src/compiler/linter.ts +++ b/developer/src/kmc-ldml/src/compiler/linter.ts @@ -1,4 +1,5 @@ -import { LDMLKeyboard, KMXPlus, CompilerCallbacks } from "@keymanapp/common-types"; +import { KMXPlus } from "@keymanapp/common-types"; +import { CompilerCallbacks, LDMLKeyboard } from "@keymanapp/developer-utils"; /** newable interface to Linter c'tor */ export type LinterNew = new (source: LDMLKeyboard.LDMLKeyboardXMLSourceFile, kmx: KMXPlus.KMXPlusFile, callbacks: CompilerCallbacks) => Linter; diff --git a/developer/src/kmc-ldml/src/compiler/loca.ts b/developer/src/kmc-ldml/src/compiler/loca.ts index 3a46475581..fea8cc4338 100644 --- a/developer/src/kmc-ldml/src/compiler/loca.ts +++ b/developer/src/kmc-ldml/src/compiler/loca.ts @@ -1,5 +1,6 @@ import { constants } from "@keymanapp/ldml-keyboard-constants"; -import { LDMLKeyboard, KMXPlus } from '@keymanapp/common-types'; +import { KMXPlus } from '@keymanapp/common-types'; +import { LDMLKeyboard } from '@keymanapp/developer-utils'; import { SectionCompiler } from "./section-compiler.js"; import { LdmlCompilerMessages } from "./ldml-compiler-messages.js"; diff --git a/developer/src/kmc-ldml/src/compiler/section-compiler.ts b/developer/src/kmc-ldml/src/compiler/section-compiler.ts index f2b14e56a3..e33eda1086 100644 --- a/developer/src/kmc-ldml/src/compiler/section-compiler.ts +++ b/developer/src/kmc-ldml/src/compiler/section-compiler.ts @@ -1,4 +1,5 @@ -import { LDMLKeyboard, KMXPlus, CompilerCallbacks } from "@keymanapp/common-types"; +import { KMXPlus } from "@keymanapp/common-types"; +import { CompilerCallbacks, LDMLKeyboard } from "@keymanapp/developer-utils"; import { SectionIdent, constants } from '@keymanapp/ldml-keyboard-constants'; /** newable interface to SectionCompiler c'tor */ diff --git a/developer/src/kmc-ldml/src/compiler/touch-layout-compiler.ts b/developer/src/kmc-ldml/src/compiler/touch-layout-compiler.ts index 5c5c7eb194..a36ab9c097 100644 --- a/developer/src/kmc-ldml/src/compiler/touch-layout-compiler.ts +++ b/developer/src/kmc-ldml/src/compiler/touch-layout-compiler.ts @@ -1,4 +1,5 @@ -import { TouchLayout, LDMLKeyboard } from "@keymanapp/common-types"; +import { TouchLayout } from "@keymanapp/common-types"; +import { LDMLKeyboard } from "@keymanapp/developer-utils"; export class TouchLayoutCompiler { public compileToJavascript(source: LDMLKeyboard.LDMLKeyboardXMLSourceFile): TouchLayout.TouchLayoutFile { diff --git a/developer/src/kmc-ldml/src/compiler/tran.ts b/developer/src/kmc-ldml/src/compiler/tran.ts index 84a0bc264f..a25cc2cc08 100644 --- a/developer/src/kmc-ldml/src/compiler/tran.ts +++ b/developer/src/kmc-ldml/src/compiler/tran.ts @@ -1,5 +1,6 @@ import { constants, SectionIdent } from "@keymanapp/ldml-keyboard-constants"; -import { util, KMXPlus, LDMLKeyboard, CompilerCallbacks, VariableParser, MarkerParser } from '@keymanapp/common-types'; +import { KMXPlus, VariableParser, MarkerParser, util } from '@keymanapp/common-types'; +import { CompilerCallbacks, LDMLKeyboard } from "@keymanapp/developer-utils"; import { SectionCompiler } from "./section-compiler.js"; import Bksp = KMXPlus.Bksp; diff --git a/developer/src/kmc-ldml/src/compiler/vars.ts b/developer/src/kmc-ldml/src/compiler/vars.ts index c54081292f..fb9b2f7596 100644 --- a/developer/src/kmc-ldml/src/compiler/vars.ts +++ b/developer/src/kmc-ldml/src/compiler/vars.ts @@ -1,6 +1,6 @@ import { SectionIdent, constants } from "@keymanapp/ldml-keyboard-constants"; -import { KMXPlus, LDMLKeyboard, CompilerCallbacks, MarkerParser } from '@keymanapp/common-types'; -import { VariableParser } from '@keymanapp/common-types'; +import { KMXPlus, VariableParser, MarkerParser } from '@keymanapp/common-types'; +import { LDMLKeyboard, CompilerCallbacks } from '@keymanapp/developer-utils'; import { SectionCompiler } from "./section-compiler.js"; import Vars = KMXPlus.Vars; import StringVarItem = KMXPlus.StringVarItem; diff --git a/developer/src/kmc-ldml/src/compiler/visual-keyboard-compiler.ts b/developer/src/kmc-ldml/src/compiler/visual-keyboard-compiler.ts index e662b923e4..6182e6e2c8 100644 --- a/developer/src/kmc-ldml/src/compiler/visual-keyboard-compiler.ts +++ b/developer/src/kmc-ldml/src/compiler/visual-keyboard-compiler.ts @@ -1,4 +1,5 @@ -import { VisualKeyboard, LDMLKeyboard, CompilerCallbacks } from "@keymanapp/common-types"; +import { VisualKeyboard } from "@keymanapp/common-types"; +import { LDMLKeyboard, CompilerCallbacks } from "@keymanapp/developer-utils"; import { KeysCompiler } from "./keys.js"; import { LdmlCompilerMessages } from "./ldml-compiler-messages.js"; diff --git a/developer/src/kmc-ldml/src/util/util.ts b/developer/src/kmc-ldml/src/util/util.ts index 21409e7299..dbb5dc0531 100644 --- a/developer/src/kmc-ldml/src/util/util.ts +++ b/developer/src/kmc-ldml/src/util/util.ts @@ -1,4 +1,4 @@ -import { LDMLKeyboard } from "@keymanapp/common-types"; +import { LDMLKeyboard } from "@keymanapp/developer-utils"; import { constants } from "@keymanapp/ldml-keyboard-constants"; /** * Verifies that value is an item in the enumeration. diff --git a/developer/src/kmc-ldml/test/helpers/index.ts b/developer/src/kmc-ldml/test/helpers/index.ts index 2e9e16ff6a..0285088acc 100644 --- a/developer/src/kmc-ldml/test/helpers/index.ts +++ b/developer/src/kmc-ldml/test/helpers/index.ts @@ -5,7 +5,8 @@ import 'mocha'; import * as path from 'path'; import { fileURLToPath } from 'url'; import { SectionCompiler, SectionCompilerNew } from '../../src/compiler/section-compiler.js'; -import { util, KMXPlus, LDMLKeyboardXMLSourceFileReader, VisualKeyboard, CompilerEvent, LDMLKeyboardTestDataXMLSourceFile, compilerEventFormat, LDMLKeyboard, UnicodeSetParser, CompilerCallbacks } from '@keymanapp/common-types'; +import { util, KMXPlus, UnicodeSetParser, VisualKeyboard } from '@keymanapp/common-types'; +import { CompilerEvent, compilerEventFormat, CompilerCallbacks, LDMLKeyboardXMLSourceFileReader, LDMLKeyboardTestDataXMLSourceFile, LDMLKeyboard, } from "@keymanapp/developer-utils"; import { LdmlKeyboardCompiler } from '../../src/main.js'; // make sure main.js compiles import { assert } from 'chai'; import { KMXPlusMetadataCompiler } from '../../src/compiler/metadata-compiler.js'; diff --git a/developer/src/kmc-ldml/test/test-compiler-e2e.ts b/developer/src/kmc-ldml/test/test-compiler-e2e.ts index e6bc3f52e2..1f87e55a22 100644 --- a/developer/src/kmc-ldml/test/test-compiler-e2e.ts +++ b/developer/src/kmc-ldml/test/test-compiler-e2e.ts @@ -1,7 +1,7 @@ import 'mocha'; import {assert} from 'chai'; import hextobin from '@keymanapp/hextobin'; -import { KMXBuilder } from '@keymanapp/common-types'; +import { KMXBuilder } from '@keymanapp/developer-utils'; import {checkMessages, compileKeyboard, compilerTestCallbacks, compilerTestOptions, makePathToFixture} from './helpers/index.js'; import { LdmlKeyboardCompiler } from '../src/compiler/compiler.js'; diff --git a/developer/src/kmc-ldml/test/test-helpers.ts b/developer/src/kmc-ldml/test/test-helpers.ts index 23bf3a258a..8a7a6ba542 100644 --- a/developer/src/kmc-ldml/test/test-helpers.ts +++ b/developer/src/kmc-ldml/test/test-helpers.ts @@ -1,4 +1,4 @@ -import { CompilerEvent } from '@keymanapp/common-types'; +import { CompilerEvent } from '@keymanapp/developer-utils'; import 'mocha'; import {assert} from 'chai'; import { CompilerEventOrMatch, matchCompilerEvents } from './helpers/index.js'; diff --git a/developer/src/kmc-ldml/test/test-messages.ts b/developer/src/kmc-ldml/test/test-messages.ts index b13d3bf104..041e1ed214 100644 --- a/developer/src/kmc-ldml/test/test-messages.ts +++ b/developer/src/kmc-ldml/test/test-messages.ts @@ -1,7 +1,7 @@ import 'mocha'; import { LdmlCompilerMessages } from '../src/compiler/ldml-compiler-messages.js'; import { verifyCompilerMessagesObject } from '@keymanapp/developer-test-helpers'; -import { CompilerErrorNamespace } from '@keymanapp/common-types'; +import { CompilerErrorNamespace } from '@keymanapp/developer-utils'; describe('LdmlCompilerMessages', function () { it('should have a valid LdmlCompilerMessages object', function() { diff --git a/developer/src/kmc-ldml/test/test-utils.ts b/developer/src/kmc-ldml/test/test-utils.ts index fcf1f78683..3b89e3c2af 100644 --- a/developer/src/kmc-ldml/test/test-utils.ts +++ b/developer/src/kmc-ldml/test/test-utils.ts @@ -5,7 +5,7 @@ import { isValidEnumValue, calculateUniqueKeys, allUsedKeyIdsInLayers, translateLayerAttrToModifier, validModifier, verifyValidAndUnique } from '../src/util/util.js'; import { constants } from "@keymanapp/ldml-keyboard-constants"; -import { LDMLKeyboard } from '@keymanapp/common-types'; +import { LDMLKeyboard } from '@keymanapp/developer-utils'; describe('test of util/util.ts', () => { describe('isValidEnumValue()', () => { diff --git a/developer/src/kmc-model-info/src/model-info-compiler-messages.ts b/developer/src/kmc-model-info/src/model-info-compiler-messages.ts index 9a1c5fdbdc..cbf6b57eb9 100644 --- a/developer/src/kmc-model-info/src/model-info-compiler-messages.ts +++ b/developer/src/kmc-model-info/src/model-info-compiler-messages.ts @@ -1,4 +1,4 @@ -import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m, CompilerMessageDef as def, CompilerMessageSpecWithException } from "@keymanapp/common-types"; +import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m, CompilerMessageDef as def, CompilerMessageSpecWithException } from "@keymanapp/developer-utils"; const Namespace = CompilerErrorNamespace.ModelInfoCompiler; // const SevInfo = CompilerErrorSeverity.Info | Namespace; @@ -44,5 +44,10 @@ export class ModelInfoCompilerMessages { static ERROR_NoLicenseFound = SevError | 0x0009; static Error_NoLicenseFound = () => m(this.ERROR_NoLicenseFound, `No license for the model was found. MIT license is required for publication to Keyman lexical-models repository.`); + + static ERROR_DescriptionIsMissing = SevError | 0x000A; + static Error_DescriptionIsMissing = (o:{filename:string}) => m( + this.ERROR_DescriptionIsMissing, + `The Info.Description field in the package ${def(o.filename)} is required, but is missing or empty.`); } diff --git a/developer/src/kmc-model-info/src/model-info-compiler.ts b/developer/src/kmc-model-info/src/model-info-compiler.ts index 09e9fc45c8..a5fb62cbcd 100644 --- a/developer/src/kmc-model-info/src/model-info-compiler.ts +++ b/developer/src/kmc-model-info/src/model-info-compiler.ts @@ -5,9 +5,9 @@ import { minKeymanVersion } from "./min-keyman-version.js"; import { ModelInfoFile } from "./model-info-file.js"; -import { CompilerCallbacks, CompilerOptions, KeymanCompiler, KeymanCompilerArtifact, KeymanCompilerArtifacts, KeymanCompilerResult, KmpJsonFile } from "@keymanapp/common-types"; +import { KmpJsonFile } from "@keymanapp/common-types"; import { ModelInfoCompilerMessages } from "./model-info-compiler-messages.js"; -import { KeymanUrls, isValidEmail, validateMITLicense } from "@keymanapp/developer-utils"; +import { CompilerCallbacks, CompilerOptions, KeymanCompiler, KeymanCompilerArtifact, KeymanCompilerArtifacts, KeymanCompilerResult,KeymanUrls, isValidEmail, validateMITLicense } from "@keymanapp/developer-utils"; /* c8 ignore start */ /** @@ -204,6 +204,9 @@ export class ModelInfoCompiler implements KeymanCompiler { if(sources.kmpJsonData.info.description?.description) { model_info.description = sources.kmpJsonData.info.description.description.trim(); + } else { + this.callbacks.reportMessage(ModelInfoCompilerMessages.Error_DescriptionIsMissing({filename:sources.kpsFilename})); + return null; } // isRTL -- this is a little bit of a heuristic from a compiled .js diff --git a/developer/src/kmc-model-info/test/test-model-info-compiler-messages.ts b/developer/src/kmc-model-info/test/test-model-info-compiler-messages.ts index 4dd1de538f..062fc9f3c0 100644 --- a/developer/src/kmc-model-info/test/test-model-info-compiler-messages.ts +++ b/developer/src/kmc-model-info/test/test-model-info-compiler-messages.ts @@ -1,7 +1,7 @@ import 'mocha'; import { ModelInfoCompilerMessages } from '../src/model-info-compiler-messages.js'; import { verifyCompilerMessagesObject } from '@keymanapp/developer-test-helpers'; -import { CompilerErrorNamespace } from '@keymanapp/common-types'; +import { CompilerErrorNamespace } from '@keymanapp/developer-utils'; describe('ModelInfoCompilerMessages', function () { it('should have a valid ModelInfoCompilerMessages object', function() { diff --git a/developer/src/kmc-model/src/compiler-callbacks.ts b/developer/src/kmc-model/src/compiler-callbacks.ts index a077035003..401a68f568 100644 --- a/developer/src/kmc-model/src/compiler-callbacks.ts +++ b/developer/src/kmc-model/src/compiler-callbacks.ts @@ -1,4 +1,4 @@ -import { CompilerCallbacks } from "@keymanapp/common-types"; +import { CompilerCallbacks } from "@keymanapp/developer-utils"; export let callbacks: CompilerCallbacks; diff --git a/developer/src/kmc-model/src/lexical-model-compiler.ts b/developer/src/kmc-model/src/lexical-model-compiler.ts index 9add61ee23..e1071512a9 100644 --- a/developer/src/kmc-model/src/lexical-model-compiler.ts +++ b/developer/src/kmc-model/src/lexical-model-compiler.ts @@ -10,7 +10,7 @@ import {decorateWithScriptOverrides} from "./script-overrides-decorator.js"; import { LexicalModelSource, WordBreakerSpec, SimpleWordBreakerSpec } from "./lexical-model.js"; import { ModelCompilerError, ModelCompilerMessageContext, ModelCompilerMessages } from "./model-compiler-messages.js"; import { callbacks, setCompilerCallbacks } from "./compiler-callbacks.js"; -import { CompilerCallbacks, CompilerOptions, KeymanCompiler, KeymanCompilerArtifact, KeymanCompilerArtifacts, KeymanCompilerResult } from "@keymanapp/common-types"; +import { CompilerCallbacks, CompilerOptions, KeymanCompiler, KeymanCompilerArtifact, KeymanCompilerArtifacts, KeymanCompilerResult } from "@keymanapp/developer-utils"; /** * An ECMAScript module as emitted by the TypeScript compiler. diff --git a/developer/src/kmc-model/src/model-compiler-messages.ts b/developer/src/kmc-model/src/model-compiler-messages.ts index 26126b5d13..51e4042ea8 100644 --- a/developer/src/kmc-model/src/model-compiler-messages.ts +++ b/developer/src/kmc-model/src/model-compiler-messages.ts @@ -1,4 +1,4 @@ -import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerEvent, CompilerMessageSpec, CompilerMessageDef as def, CompilerMessageSpecWithException } from "@keymanapp/common-types"; +import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerEvent, CompilerMessageSpec, CompilerMessageDef as def, CompilerMessageSpecWithException } from "@keymanapp/developer-utils"; const Namespace = CompilerErrorNamespace.ModelCompiler; // const SevInfo = CompilerErrorSeverity.Info | Namespace; diff --git a/developer/src/kmc-model/test/test-messages.ts b/developer/src/kmc-model/test/test-messages.ts index df584d80d1..2f87dfd718 100644 --- a/developer/src/kmc-model/test/test-messages.ts +++ b/developer/src/kmc-model/test/test-messages.ts @@ -1,7 +1,7 @@ import 'mocha'; import { ModelCompilerMessages } from '../src/model-compiler-messages.js'; import { verifyCompilerMessagesObject } from '@keymanapp/developer-test-helpers'; -import { CompilerErrorNamespace } from '@keymanapp/common-types'; +import { CompilerErrorNamespace } from '@keymanapp/developer-utils'; describe('ModelCompilerMessages', function () { it('should have a valid ModelCompilerMessages object', function() { diff --git a/developer/src/kmc-package/build.sh b/developer/src/kmc-package/build.sh index 27c725a963..0b2d7bda9b 100755 --- a/developer/src/kmc-package/build.sh +++ b/developer/src/kmc-package/build.sh @@ -14,6 +14,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" builder_describe "Build Keyman kmc Package Compiler module" \ "@/common/web/keyman-version" \ "@/developer/src/common/web/test-helpers" \ + "@/developer/src/common/web/utils" \ "configure" \ "build" \ "api analyze API and prepare API documentation" \ diff --git a/developer/src/kmc-package/package.json b/developer/src/kmc-package/package.json index 22bc7b024d..521ae02e44 100644 --- a/developer/src/kmc-package/package.json +++ b/developer/src/kmc-package/package.json @@ -30,6 +30,7 @@ }, "dependencies": { "@keymanapp/common-types": "*", + "@keymanapp/developer-utils": "*", "jszip": "^3.7.0", "marked": "^7.0.0" }, diff --git a/developer/src/kmc-package/src/compiler/kmp-compiler.ts b/developer/src/kmc-package/src/compiler/kmp-compiler.ts index b36f2da682..04688d0e5a 100644 --- a/developer/src/kmc-package/src/compiler/kmp-compiler.ts +++ b/developer/src/kmc-package/src/compiler/kmp-compiler.ts @@ -1,8 +1,9 @@ -import { xml2js } from '@keymanapp/common-types'; +import { xml2js } from '@keymanapp/developer-utils'; import JSZip from 'jszip'; import KEYMAN_VERSION from "@keymanapp/keyman-version"; -import { KmpJsonFile, KpsFile, SchemaValidators, CompilerCallbacks, KeymanFileTypes, KvkFile, KeymanCompiler, CompilerOptions, KeymanCompilerResult, KeymanCompilerArtifacts, KeymanCompilerArtifact } from '@keymanapp/common-types'; +import { KmpJsonFile, SchemaValidators, KeymanFileTypes, KvkFile } from '@keymanapp/common-types'; +import { CompilerCallbacks, KpsFile, KeymanCompiler, CompilerOptions, KeymanCompilerResult, KeymanCompilerArtifacts, KeymanCompilerArtifact } from '@keymanapp/developer-utils'; import { PackageCompilerMessages } from './package-compiler-messages.js'; import { PackageMetadataCollector } from './package-metadata-collector.js'; import { KmpInfWriter } from './kmp-inf-writer.js'; diff --git a/developer/src/kmc-package/src/compiler/package-compiler-messages.ts b/developer/src/kmc-package/src/compiler/package-compiler-messages.ts index b974996fa6..00d8a380b5 100644 --- a/developer/src/kmc-package/src/compiler/package-compiler-messages.ts +++ b/developer/src/kmc-package/src/compiler/package-compiler-messages.ts @@ -1,4 +1,4 @@ -import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m, CompilerMessageDef as def, CompilerMessageSpecWithException } from "@keymanapp/common-types"; +import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m, CompilerMessageDef as def, CompilerMessageSpecWithException } from "@keymanapp/developer-utils"; const Namespace = CompilerErrorNamespace.PackageCompiler; const SevInfo = CompilerErrorSeverity.Info | Namespace; @@ -138,5 +138,11 @@ export class PackageCompilerMessages { static ERROR_InvalidAuthorEmail = SevError | 0x0020; static Error_InvalidAuthorEmail = (o:{email:string}) => m(this.ERROR_InvalidAuthorEmail, `Invalid author email: ${def(o.email)}`); + + static ERROR_PackageFileHasEmptyVersion = SevError | 0x0021; + static Error_PackageFileHasEmptyVersion = () => m( + this.ERROR_PackageFileHasEmptyVersion, + `Package version is not following keyboard version, but the package version field is blank.` + ); } diff --git a/developer/src/kmc-package/src/compiler/package-keyboard-target-validator.ts b/developer/src/kmc-package/src/compiler/package-keyboard-target-validator.ts index 91a362528d..06f36c7727 100644 --- a/developer/src/kmc-package/src/compiler/package-keyboard-target-validator.ts +++ b/developer/src/kmc-package/src/compiler/package-keyboard-target-validator.ts @@ -1,4 +1,5 @@ -import { KeymanTargets, CompilerCallbacks, KmpJsonFile } from "@keymanapp/common-types"; +import { KeymanTargets, KmpJsonFile } from "@keymanapp/common-types"; +import { CompilerCallbacks } from "@keymanapp/developer-utils"; import { PackageCompilerMessages } from "./package-compiler-messages.js"; import { KeyboardMetadataCollection } from "./package-metadata-collector.js"; diff --git a/developer/src/kmc-package/src/compiler/package-metadata-collector.ts b/developer/src/kmc-package/src/compiler/package-metadata-collector.ts index 3c9c2fc7e3..89a8f35b09 100644 --- a/developer/src/kmc-package/src/compiler/package-metadata-collector.ts +++ b/developer/src/kmc-package/src/compiler/package-metadata-collector.ts @@ -1,4 +1,5 @@ -import { KmpJsonFile, CompilerCallbacks, KmxFileReader, KmxFileReaderError, KMX, KeymanFileTypes } from '@keymanapp/common-types'; +import { KmpJsonFile, KmxFileReader, KmxFileReaderError, KMX, KeymanFileTypes } from '@keymanapp/common-types'; +import { CompilerCallbacks } from "@keymanapp/developer-utils"; import { getCompiledKmxKeyboardMetadata } from './kmx-keyboard-metadata.js'; import { PackageCompilerMessages } from './package-compiler-messages.js'; import { getCompiledWebKeyboardMetadata, WebKeyboardMetadata } from './web-keyboard-metadata.js'; diff --git a/developer/src/kmc-package/src/compiler/package-validation.ts b/developer/src/kmc-package/src/compiler/package-validation.ts index 1ba9911b31..a55610adad 100644 --- a/developer/src/kmc-package/src/compiler/package-validation.ts +++ b/developer/src/kmc-package/src/compiler/package-validation.ts @@ -1,7 +1,7 @@ -import { KmpJsonFile, CompilerCallbacks, CompilerOptions, KeymanFileTypes } from '@keymanapp/common-types'; +import { KmpJsonFile, KeymanFileTypes } from '@keymanapp/common-types'; import { PackageCompilerMessages } from './package-compiler-messages.js'; import { keymanEngineForWindowsFiles, keymanForWindowsInstallerFiles, keymanForWindowsRedistFiles } from './redist-files.js'; -import { isValidEmail } from '@keymanapp/developer-utils'; +import { isValidEmail, CompilerCallbacks, CompilerOptions } from '@keymanapp/developer-utils'; // The keyboard ID SHOULD adhere to this pattern: const KEYBOARD_ID_PATTERN_PACKAGE = /^[a-z_][a-z0-9_]*\.(kps|kmp)$/; diff --git a/developer/src/kmc-package/src/compiler/package-version-validator.ts b/developer/src/kmc-package/src/compiler/package-version-validator.ts index 3456253a4f..b20e086aec 100644 --- a/developer/src/kmc-package/src/compiler/package-version-validator.ts +++ b/developer/src/kmc-package/src/compiler/package-version-validator.ts @@ -1,6 +1,7 @@ -import { KmpJsonFile, CompilerCallbacks, KpsFile } from '@keymanapp/common-types'; +import { KmpJsonFile } from '@keymanapp/common-types'; import { PackageCompilerMessages } from './package-compiler-messages.js'; import { KeyboardMetadataCollection } from './package-metadata-collector.js'; +import { KpsFile, CompilerCallbacks } from '@keymanapp/developer-utils'; export const DEFAULT_KEYBOARD_VERSION = '1.0'; export const MIN_LM_FILEVERSION_KMP_JSON = '12.0'; @@ -41,6 +42,11 @@ export class PackageVersionValidator { if(!this.checkFollowKeyboardVersion(kmp)) { return false; } + } else { + if(!kmp.info.version) { + this.callbacks.reportMessage(PackageCompilerMessages.Error_PackageFileHasEmptyVersion()); + return false; + } } if(!kmp.keyboards) { diff --git a/developer/src/kmc-package/src/compiler/windows-package-installer-compiler.ts b/developer/src/kmc-package/src/compiler/windows-package-installer-compiler.ts index a41c86091b..3eefada898 100644 --- a/developer/src/kmc-package/src/compiler/windows-package-installer-compiler.ts +++ b/developer/src/kmc-package/src/compiler/windows-package-installer-compiler.ts @@ -11,7 +11,8 @@ */ import JSZip from 'jszip'; -import { CompilerCallbacks, KeymanCompiler, KeymanCompilerArtifact, KeymanCompilerArtifacts, KeymanCompilerResult, KeymanFileTypes, KmpJsonFile, KpsFile } from "@keymanapp/common-types"; +import { KeymanFileTypes, KmpJsonFile } from "@keymanapp/common-types"; +import { CompilerCallbacks, KeymanCompiler, KeymanCompilerArtifact, KeymanCompilerArtifacts, KeymanCompilerResult, KpsFile } from '@keymanapp/developer-utils'; import KEYMAN_VERSION from "@keymanapp/keyman-version"; import { KmpCompiler, KmpCompilerOptions } from "./kmp-compiler.js"; import { PackageCompilerMessages } from "./package-compiler-messages.js"; diff --git a/developer/src/kmc-package/test/fixtures/absolute_path/source/absolute_path.kps b/developer/src/kmc-package/test/fixtures/absolute_path/source/absolute_path.kps index e7c4a8b851..b5a74c06ee 100644 --- a/developer/src/kmc-package/test/fixtures/absolute_path/source/absolute_path.kps +++ b/developer/src/kmc-package/test/fixtures/absolute_path/source/absolute_path.kps @@ -17,6 +17,7 @@ Absolute Path + 1.0 diff --git a/developer/src/kmc-package/test/fixtures/invalid/error_package_file_has_empty_version.kps b/developer/src/kmc-package/test/fixtures/invalid/error_package_file_has_empty_version.kps new file mode 100644 index 0000000000..386b4e2e03 --- /dev/null +++ b/developer/src/kmc-package/test/fixtures/invalid/error_package_file_has_empty_version.kps @@ -0,0 +1,32 @@ + + + + 15.0.266.0 + 7.0 + + + + Invalid Email Address + © 2019 National Research Council Canada + Eddie Antonio Santos + + + + + basic.kmx + Keyboard Basic + 0 + .kmx + + + + + Basic + basic + 1.0 + + Central Khmer (Khmer, Cambodia) + + + + diff --git a/developer/src/kmc-package/test/test-kmp-inf-writer.ts b/developer/src/kmc-package/test/test-kmp-inf-writer.ts index b49f39311e..f852fc69b8 100644 --- a/developer/src/kmc-package/test/test-kmp-inf-writer.ts +++ b/developer/src/kmc-package/test/test-kmp-inf-writer.ts @@ -36,7 +36,7 @@ type InfFile = {[name:string]: Section}; * which never repeats */ function parseInf(inf: string): InfFile { - let items = inf.split('\r\n'); + let items = inf.replaceAll(/\r\n/g, '\n').split('\n'); let sections: InfFile = {}, newSection: Section = {}; sections[0] = newSection; for(let item of items) { diff --git a/developer/src/kmc-package/test/test-messages.ts b/developer/src/kmc-package/test/test-messages.ts index c80e48d4a6..2d8df44eb5 100644 --- a/developer/src/kmc-package/test/test-messages.ts +++ b/developer/src/kmc-package/test/test-messages.ts @@ -4,7 +4,7 @@ import { TestCompilerCallbacks, verifyCompilerMessagesObject } from '@keymanapp/ import { PackageCompilerMessages } from '../src/compiler/package-compiler-messages.js'; import { makePathToFixture } from './helpers/index.js'; import { KmpCompiler } from '../src/compiler/kmp-compiler.js'; -import { CompilerErrorNamespace, CompilerOptions } from '@keymanapp/common-types'; +import { CompilerErrorNamespace, CompilerOptions } from '@keymanapp/developer-utils'; const debug = false; const callbacks = new TestCompilerCallbacks(); @@ -236,4 +236,8 @@ describe('PackageCompilerMessages', function () { PackageCompilerMessages.ERROR_InvalidAuthorEmail); }); + it('should generate ERROR_PackageFileHasEmptyVersion if FollowKeyboardVersion is not present and Version is empty', async function() { + await testForMessage(this, ['invalid', 'error_package_file_has_empty_version.kps'], + PackageCompilerMessages.ERROR_PackageFileHasEmptyVersion); + }); }); diff --git a/developer/src/kmc-package/test/test-package-compiler.ts b/developer/src/kmc-package/test/test-package-compiler.ts index 3f0e8d28fd..7952e2145a 100644 --- a/developer/src/kmc-package/test/test-package-compiler.ts +++ b/developer/src/kmc-package/test/test-package-compiler.ts @@ -209,6 +209,8 @@ describe('KmpCompiler', function () { kmpJson = kmpCompiler.transformKpsToKmpObject(kpsPath); }); + assert.isNotNull(kmpJson); + await assert.isNull(kmpCompiler.buildKmpFile(kpsPath, kmpJson)); if(debug) callbacks.printMessages(); diff --git a/developer/src/kmc-package/tsconfig.json b/developer/src/kmc-package/tsconfig.json index 0ab78a91ff..4fae2b81ec 100644 --- a/developer/src/kmc-package/tsconfig.json +++ b/developer/src/kmc-package/tsconfig.json @@ -10,6 +10,7 @@ "src/**/*.ts", ], "references": [ + { "path": "../common/web/utils" }, { "path": "../../../common/web/keyman-version" }, { "path": "../../../common/web/types" }, ] diff --git a/developer/src/kmc/src/commands/analyze.ts b/developer/src/kmc/src/commands/analyze.ts index 3c53609179..5085262f07 100644 --- a/developer/src/kmc/src/commands/analyze.ts +++ b/developer/src/kmc/src/commands/analyze.ts @@ -3,7 +3,7 @@ import * as path from 'path'; import { Command, Option } from 'commander'; import { NodeCompilerCallbacks } from '../util/NodeCompilerCallbacks.js'; import { InfrastructureMessages } from '../messages/infrastructureMessages.js'; -import { CompilerCallbacks, CompilerLogLevel } from '@keymanapp/common-types'; +import { CompilerCallbacks, CompilerLogLevel } from '@keymanapp/developer-utils'; import { AnalyzeOskCharacterUse, AnalyzeOskRewritePua } from '@keymanapp/kmc-analyze'; import { BaseOptions } from '../util/baseOptions.js'; import { runOnFiles } from '../util/projectRunner.js'; diff --git a/developer/src/kmc/src/commands/build.ts b/developer/src/kmc/src/commands/build.ts index 9669997055..b8d5496c5b 100644 --- a/developer/src/kmc/src/commands/build.ts +++ b/developer/src/kmc/src/commands/build.ts @@ -5,7 +5,8 @@ import { buildActivities } from './buildClasses/buildActivities.js'; import { BuildProject } from './buildClasses/BuildProject.js'; import { NodeCompilerCallbacks } from '../util/NodeCompilerCallbacks.js'; import { InfrastructureMessages } from '../messages/infrastructureMessages.js'; -import { CompilerFileCallbacks, CompilerOptions, KeymanFileTypes } from '@keymanapp/common-types'; +import { KeymanFileTypes } from '@keymanapp/common-types'; +import { CompilerOptions, CompilerFileCallbacks } from '@keymanapp/developer-utils'; import { BaseOptions } from '../util/baseOptions.js'; import { expandFileLists } from '../util/fileLists.js'; import { isProject } from '../util/projectLoader.js'; diff --git a/developer/src/kmc/src/commands/buildClasses/BuildActivity.ts b/developer/src/kmc/src/commands/buildClasses/BuildActivity.ts index 864611c26d..a8cde224bc 100644 --- a/developer/src/kmc/src/commands/buildClasses/BuildActivity.ts +++ b/developer/src/kmc/src/commands/buildClasses/BuildActivity.ts @@ -1,6 +1,7 @@ import * as fs from 'fs'; import * as path from 'path'; -import { CompilerCallbacks, CompilerOptions, KeymanCompiler, KeymanFileTypes } from "@keymanapp/common-types"; +import { KeymanFileTypes } from "@keymanapp/common-types"; +import { CompilerCallbacks, CompilerOptions, KeymanCompiler } from "@keymanapp/developer-utils"; import { InfrastructureMessages } from '../../messages/infrastructureMessages.js'; export abstract class BuildActivity { diff --git a/developer/src/kmc/src/commands/buildClasses/BuildKeyboardInfo.ts b/developer/src/kmc/src/commands/buildClasses/BuildKeyboardInfo.ts index e25297c735..4248000c7a 100644 --- a/developer/src/kmc/src/commands/buildClasses/BuildKeyboardInfo.ts +++ b/developer/src/kmc/src/commands/buildClasses/BuildKeyboardInfo.ts @@ -1,7 +1,8 @@ import * as fs from 'fs'; import * as path from 'path'; import { BuildActivity } from './BuildActivity.js'; -import { CompilerCallbacks, KeymanFileTypes } from '@keymanapp/common-types'; +import { KeymanFileTypes } from '@keymanapp/common-types'; +import { CompilerCallbacks } from '@keymanapp/developer-utils'; import { KeyboardInfoCompiler } from '@keymanapp/kmc-keyboard-info'; import { loadProject } from '../../util/projectLoader.js'; import { InfrastructureMessages } from '../../messages/infrastructureMessages.js'; diff --git a/developer/src/kmc/src/commands/buildClasses/BuildKmnKeyboard.ts b/developer/src/kmc/src/commands/buildClasses/BuildKmnKeyboard.ts index e540aba451..a4d6f45b85 100644 --- a/developer/src/kmc/src/commands/buildClasses/BuildKmnKeyboard.ts +++ b/developer/src/kmc/src/commands/buildClasses/BuildKmnKeyboard.ts @@ -1,7 +1,8 @@ import * as path from 'path'; import { platform } from 'os'; import { KmnCompiler } from '@keymanapp/kmc-kmn'; -import { CompilerOptions, CompilerCallbacks, KeymanFileTypes } from '@keymanapp/common-types'; +import { KeymanFileTypes } from '@keymanapp/common-types'; +import { CompilerOptions, CompilerCallbacks } from '@keymanapp/developer-utils'; import { BuildActivity } from './BuildActivity.js'; export class BuildKmnKeyboard extends BuildActivity { diff --git a/developer/src/kmc/src/commands/buildClasses/BuildLdmlKeyboard.ts b/developer/src/kmc/src/commands/buildClasses/BuildLdmlKeyboard.ts index 0e0cfd9766..6ac98c9b92 100644 --- a/developer/src/kmc/src/commands/buildClasses/BuildLdmlKeyboard.ts +++ b/developer/src/kmc/src/commands/buildClasses/BuildLdmlKeyboard.ts @@ -1,5 +1,7 @@ import * as kmcLdml from '@keymanapp/kmc-ldml'; -import { CompilerCallbacks, LDMLKeyboardXMLSourceFileReader, CompilerOptions, KeymanFileTypes } from '@keymanapp/common-types'; +import { KeymanFileTypes } from '@keymanapp/common-types'; +import { CompilerOptions, CompilerCallbacks } from '@keymanapp/developer-utils'; +import { LDMLKeyboardXMLSourceFileReader } from '@keymanapp/developer-utils'; import { BuildActivity } from './BuildActivity.js'; import { fileURLToPath } from 'url'; diff --git a/developer/src/kmc/src/commands/buildClasses/BuildModel.ts b/developer/src/kmc/src/commands/buildClasses/BuildModel.ts index b2afc59294..c01d1adf20 100644 --- a/developer/src/kmc/src/commands/buildClasses/BuildModel.ts +++ b/developer/src/kmc/src/commands/buildClasses/BuildModel.ts @@ -1,6 +1,7 @@ import { BuildActivity } from './BuildActivity.js'; import { LexicalModelCompiler } from '@keymanapp/kmc-model'; -import { CompilerCallbacks, CompilerOptions, KeymanFileTypes } from '@keymanapp/common-types'; +import { KeymanFileTypes } from '@keymanapp/common-types'; +import { CompilerOptions, CompilerCallbacks } from '@keymanapp/developer-utils'; export class BuildModel extends BuildActivity { public get name(): string { return 'Lexical model'; } diff --git a/developer/src/kmc/src/commands/buildClasses/BuildModelInfo.ts b/developer/src/kmc/src/commands/buildClasses/BuildModelInfo.ts index 0fca855540..3924309f93 100644 --- a/developer/src/kmc/src/commands/buildClasses/BuildModelInfo.ts +++ b/developer/src/kmc/src/commands/buildClasses/BuildModelInfo.ts @@ -1,7 +1,8 @@ import * as fs from 'fs'; import * as path from 'path'; import { BuildActivity } from './BuildActivity.js'; -import { CompilerCallbacks, KeymanFileTypes } from '@keymanapp/common-types'; +import { KeymanFileTypes } from '@keymanapp/common-types'; +import { CompilerCallbacks } from '@keymanapp/developer-utils'; import { ModelInfoCompiler } from '@keymanapp/kmc-model-info'; import { KmpCompiler } from '@keymanapp/kmc-package'; import { loadProject } from '../../util/projectLoader.js'; diff --git a/developer/src/kmc/src/commands/buildClasses/BuildPackage.ts b/developer/src/kmc/src/commands/buildClasses/BuildPackage.ts index 1bb26b3b7f..8ecc08dace 100644 --- a/developer/src/kmc/src/commands/buildClasses/BuildPackage.ts +++ b/developer/src/kmc/src/commands/buildClasses/BuildPackage.ts @@ -1,5 +1,6 @@ import { BuildActivity } from './BuildActivity.js'; -import { CompilerCallbacks, CompilerOptions, KeymanFileTypes } from '@keymanapp/common-types'; +import { KeymanFileTypes } from '@keymanapp/common-types'; +import { CompilerOptions, CompilerCallbacks } from '@keymanapp/developer-utils'; import { KmpCompiler } from '@keymanapp/kmc-package'; export class BuildPackage extends BuildActivity { diff --git a/developer/src/kmc/src/commands/buildClasses/BuildProject.ts b/developer/src/kmc/src/commands/buildClasses/BuildProject.ts index 4a5f9148bc..ee1204a7f0 100644 --- a/developer/src/kmc/src/commands/buildClasses/BuildProject.ts +++ b/developer/src/kmc/src/commands/buildClasses/BuildProject.ts @@ -1,6 +1,8 @@ import * as path from 'path'; import * as fs from 'fs'; -import { CompilerCallbacks, CompilerFileCallbacks, KeymanDeveloperProject, KeymanDeveloperProjectFile, KeymanDeveloperProjectType, KeymanFileTypes } from '@keymanapp/common-types'; +import { KeymanFileTypes } from '@keymanapp/common-types'; +import { CompilerFileCallbacks, CompilerCallbacks } from '@keymanapp/developer-utils'; +import { KeymanDeveloperProject, KeymanDeveloperProjectFile, KeymanDeveloperProjectType } from '@keymanapp/developer-utils'; import { BuildActivity } from './BuildActivity.js'; import { buildActivities, buildKeyboardInfoActivity, buildModelInfoActivity } from './buildActivities.js'; import { InfrastructureMessages } from '../../messages/infrastructureMessages.js'; diff --git a/developer/src/kmc/src/commands/buildTestData/index.ts b/developer/src/kmc/src/commands/buildTestData/index.ts index 6e598954c1..c958673c2f 100644 --- a/developer/src/kmc/src/commands/buildTestData/index.ts +++ b/developer/src/kmc/src/commands/buildTestData/index.ts @@ -1,7 +1,7 @@ import * as fs from 'fs'; import * as path from 'path'; import * as kmcLdml from '@keymanapp/kmc-ldml'; -import { CompilerCallbacks, defaultCompilerOptions, LDMLKeyboardTestDataXMLSourceFile, LDMLKeyboardXMLSourceFileReader } from '@keymanapp/common-types'; +import { CompilerCallbacks, defaultCompilerOptions, LDMLKeyboardTestDataXMLSourceFile, LDMLKeyboardXMLSourceFileReader } from '@keymanapp/developer-utils'; import { NodeCompilerCallbacks } from '../../util/NodeCompilerCallbacks.js'; import { fileURLToPath } from 'url'; import { CommandLineBaseOptions } from 'src/util/baseOptions.js'; diff --git a/developer/src/kmc/src/commands/buildWindowsPackageInstaller/index.ts b/developer/src/kmc/src/commands/buildWindowsPackageInstaller/index.ts index 591dfe2e02..06076db929 100644 --- a/developer/src/kmc/src/commands/buildWindowsPackageInstaller/index.ts +++ b/developer/src/kmc/src/commands/buildWindowsPackageInstaller/index.ts @@ -1,6 +1,6 @@ import * as fs from 'fs'; import * as path from 'path'; -import { CompilerCallbacks, defaultCompilerOptions } from '@keymanapp/common-types'; +import { CompilerCallbacks, defaultCompilerOptions } from '@keymanapp/developer-utils'; import { NodeCompilerCallbacks } from '../../util/NodeCompilerCallbacks.js'; import { WindowsPackageInstallerCompiler, WindowsPackageInstallerSources } from '@keymanapp/kmc-package'; import { CommandLineBaseOptions } from 'src/util/baseOptions.js'; diff --git a/developer/src/kmc/src/commands/messageCommand.ts b/developer/src/kmc/src/commands/messageCommand.ts index 94b95f300f..ee568dad9c 100644 --- a/developer/src/kmc/src/commands/messageCommand.ts +++ b/developer/src/kmc/src/commands/messageCommand.ts @@ -1,14 +1,13 @@ import * as fs from 'fs'; import * as path from 'path'; -import { CompilerBaseOptions, CompilerCallbacks, CompilerError, CompilerErrorNamespace, CompilerEvent } from '@keymanapp/common-types'; import { Command, Option } from 'commander'; +import { escapeMarkdownChar, KeymanUrls, CompilerBaseOptions, CompilerCallbacks, CompilerError, CompilerErrorNamespace, CompilerEvent } from '@keymanapp/developer-utils'; import { CompilerMessageSource, messageNamespaceKeys, messageSources } from '../messages/messageNamespaces.js'; import { NodeCompilerCallbacks } from '../util/NodeCompilerCallbacks.js'; import { exitProcess } from '../util/sysexits.js'; import { InfrastructureMessages } from '../messages/infrastructureMessages.js'; import { CompilerMessageDetail, findMessageDetails, findMessagesById, getMessageIdentifiersSorted } from '../util/extendedCompilerOptions.js'; -import { escapeMarkdownChar, KeymanUrls } from '@keymanapp/developer-utils'; type MessageFormat = 'text'|'markdown'|'json'; diff --git a/developer/src/kmc/src/messages/infrastructureMessages.ts b/developer/src/kmc/src/messages/infrastructureMessages.ts index 7c96917cae..b4d8cebd2e 100644 --- a/developer/src/kmc/src/messages/infrastructureMessages.ts +++ b/developer/src/kmc/src/messages/infrastructureMessages.ts @@ -1,4 +1,4 @@ -import { CompilerError, CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m, CompilerMessageDef as def, CompilerMessageSpecWithException } from "@keymanapp/common-types"; +import { CompilerError, CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m, CompilerMessageDef as def, CompilerMessageSpecWithException } from "@keymanapp/developer-utils"; const Namespace = CompilerErrorNamespace.Infrastructure; const SevInfo = CompilerErrorSeverity.Info | Namespace; diff --git a/developer/src/kmc/src/messages/messageNamespaces.ts b/developer/src/kmc/src/messages/messageNamespaces.ts index 2e0bef61b5..fc0e7e4d27 100644 --- a/developer/src/kmc/src/messages/messageNamespaces.ts +++ b/developer/src/kmc/src/messages/messageNamespaces.ts @@ -1,4 +1,4 @@ -import { CommonTypesMessages, CompilerErrorNamespace } from '@keymanapp/common-types'; +import { CommonTypesMessages, CompilerErrorNamespace } from '@keymanapp/developer-utils'; import { AnalyzerMessages } from '@keymanapp/kmc-analyze'; import { KeyboardInfoCompilerMessages } from '@keymanapp/kmc-keyboard-info'; import { KmnCompilerMessages, KmwCompilerMessages } from '@keymanapp/kmc-kmn'; diff --git a/developer/src/kmc/src/util/NodeCompilerCallbacks.ts b/developer/src/kmc/src/util/NodeCompilerCallbacks.ts index 446924913a..f94e06c18a 100644 --- a/developer/src/kmc/src/util/NodeCompilerCallbacks.ts +++ b/developer/src/kmc/src/util/NodeCompilerCallbacks.ts @@ -6,7 +6,7 @@ import { CompilerCallbacks, CompilerEvent, compilerLogLevelToSeverity, CompilerErrorSeverity, CompilerError, CompilerCallbackOptions, - CompilerFileCallbacks} from '@keymanapp/common-types'; + CompilerFileCallbacks} from '@keymanapp/developer-utils'; import { InfrastructureMessages } from '../messages/infrastructureMessages.js'; import chalk from 'chalk'; import supportsColor from 'supports-color'; diff --git a/developer/src/kmc/src/util/baseOptions.ts b/developer/src/kmc/src/util/baseOptions.ts index dd91f0bae6..ab07921dbd 100644 --- a/developer/src/kmc/src/util/baseOptions.ts +++ b/developer/src/kmc/src/util/baseOptions.ts @@ -1,4 +1,4 @@ -import { ALL_COMPILER_LOG_FORMATS, ALL_COMPILER_LOG_LEVELS, CompilerLogFormat, CompilerLogLevel } from "@keymanapp/common-types"; +import { ALL_COMPILER_LOG_FORMATS, ALL_COMPILER_LOG_LEVELS, CompilerLogFormat, CompilerLogLevel } from "@keymanapp/developer-utils"; import { Command, Option } from "commander"; /** diff --git a/developer/src/kmc/src/util/extendedCompilerOptions.ts b/developer/src/kmc/src/util/extendedCompilerOptions.ts index e9c90e47f0..0d72b5b550 100644 --- a/developer/src/kmc/src/util/extendedCompilerOptions.ts +++ b/developer/src/kmc/src/util/extendedCompilerOptions.ts @@ -1,4 +1,4 @@ -import { CompilerCallbacks, CompilerError, CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageOverride, CompilerMessageOverrideMap, CompilerOptions } from '@keymanapp/common-types'; +import { CompilerCallbacks, CompilerError, CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageOverride, CompilerMessageOverrideMap, CompilerOptions } from '@keymanapp/developer-utils'; import { InfrastructureMessages } from '../messages/infrastructureMessages.js'; import { CompilerMessageSource, messageNamespaceKeys, messageSources } from '../messages/messageNamespaces.js'; diff --git a/developer/src/kmc/src/util/fileLists.ts b/developer/src/kmc/src/util/fileLists.ts index ecd786d0ae..29defb4b8d 100644 --- a/developer/src/kmc/src/util/fileLists.ts +++ b/developer/src/kmc/src/util/fileLists.ts @@ -1,6 +1,6 @@ import * as fs from 'fs'; import * as path from 'path'; -import { CompilerCallbacks } from "@keymanapp/common-types"; +import { CompilerCallbacks } from "@keymanapp/developer-utils"; import { InfrastructureMessages } from "../messages/infrastructureMessages.js"; /** diff --git a/developer/src/kmc/src/util/projectLoader.ts b/developer/src/kmc/src/util/projectLoader.ts index b26399ee39..04a1af2796 100644 --- a/developer/src/kmc/src/util/projectLoader.ts +++ b/developer/src/kmc/src/util/projectLoader.ts @@ -1,7 +1,8 @@ import * as path from 'path'; import * as fs from 'fs'; -import { CompilerCallbacks, KeymanDeveloperProject, KeymanFileTypes, KPJFileReader } from "@keymanapp/common-types"; +import { KeymanFileTypes } from "@keymanapp/common-types"; +import { CompilerCallbacks, KeymanDeveloperProject, KPJFileReader } from "@keymanapp/developer-utils"; import { InfrastructureMessages } from "../messages/infrastructureMessages.js"; export const isProject = (filename: string): boolean => diff --git a/developer/src/kmc/src/util/projectRunner.ts b/developer/src/kmc/src/util/projectRunner.ts index 1f3ffdfcd3..c4186635b7 100644 --- a/developer/src/kmc/src/util/projectRunner.ts +++ b/developer/src/kmc/src/util/projectRunner.ts @@ -1,4 +1,5 @@ -import { CompilerCallbacks, KeymanFileTypes } from "@keymanapp/common-types"; +import { KeymanFileTypes } from '@keymanapp/common-types'; +import { CompilerCallbacks } from '@keymanapp/developer-utils'; import { isProject, loadProject } from './projectLoader.js'; async function runProject(callbacks: CompilerCallbacks, filename: string, callback: (filename:string)=>Promise): Promise { diff --git a/developer/src/kmc/test/test-extendedCompilerOptions.ts b/developer/src/kmc/test/test-extendedCompilerOptions.ts index f0a304f2f4..adda29dfdb 100644 --- a/developer/src/kmc/test/test-extendedCompilerOptions.ts +++ b/developer/src/kmc/test/test-extendedCompilerOptions.ts @@ -3,7 +3,7 @@ import { assert } from 'chai'; import 'mocha'; import { unitTestEndpoints } from '../src/util/extendedCompilerOptions.js'; import { InfrastructureMessages } from '../src/messages/infrastructureMessages.js'; -import { CompilerError, CompilerMessageOverride, CompilerErrorSeverity } from '@keymanapp/common-types'; +import { CompilerError, CompilerMessageOverride, CompilerErrorSeverity } from '@keymanapp/developer-utils'; import { KmnCompilerMessages } from '@keymanapp/kmc-kmn'; interface MessageTest {input: string, result: CompilerMessageOverride}; diff --git a/developer/src/kmc/test/test-infrastructureMessages.ts b/developer/src/kmc/test/test-infrastructureMessages.ts index bd39a0a65b..37316a8f3c 100644 --- a/developer/src/kmc/test/test-infrastructureMessages.ts +++ b/developer/src/kmc/test/test-infrastructureMessages.ts @@ -1,15 +1,16 @@ import 'mocha'; +import * as fs from 'fs'; import { assert } from 'chai'; import { InfrastructureMessages } from '../src/messages/infrastructureMessages.js'; import { verifyCompilerMessagesObject } from '@keymanapp/developer-test-helpers'; import { makePathToFixture } from './helpers/index.js'; import { NodeCompilerCallbacks } from '../src/util/NodeCompilerCallbacks.js'; -import { CompilerErrorNamespace, CompilerEvent, KeymanFileTypes } from '@keymanapp/common-types'; +import { KeymanFileTypes } from '@keymanapp/common-types'; import { unitTestEndpoints } from '../src/commands/build.js'; import { KmnCompilerMessages } from '@keymanapp/kmc-kmn'; import { clearOptions } from '@keymanapp/developer-utils'; import { loadProject } from '../src/util/projectLoader.js'; -import { defaultCompilerOptions, CompilerOptions} from '@keymanapp/common-types'; +import { CompilerErrorNamespace, CompilerEvent, defaultCompilerOptions, CompilerOptions} from '@keymanapp/developer-utils'; import { analyzeUnitTestEndpoints } from '../src/commands/analyze.js'; import { BuildKeyboardInfo } from '../src/commands/buildClasses/BuildKeyboardInfo.js'; import { BuildModelInfo } from '../src/commands/buildClasses/BuildModelInfo.js'; @@ -171,10 +172,19 @@ describe('InfrastructureMessages', function () { it('should generate HINT_FilenameHasDifferingCase if a referenced file has differing case', async function() { // This message is generated by NodeCompilerCallbacks, because that's where the filesystem is visible, // so we can't use our usual testForMessage pattern. - const ncb = new NodeCompilerCallbacks({logLevel: 'silent'}); - const expectedMessages = [InfrastructureMessages.HINT_FilenameHasDifferingCase]; - ncb.loadFile(makePathToFixture('invalid-keyboards', 'Hint_Filename_Has_Differing_Case.kmn')); - assertMessagesEqual(ncb.messages, expectedMessages); + const filename = makePathToFixture('invalid-keyboards', 'Hint_Filename_Has_Differing_Case.kmn'); + if(fs.existsSync(filename)) { + // The file is actually named 'hint_filename_has_differing_case.kmn', so + // if we can see it, then we know we are not on a case-sensitive + // filesystem, and so we can test + const ncb = new NodeCompilerCallbacks({logLevel: 'silent'}); + const expectedMessages = [InfrastructureMessages.HINT_FilenameHasDifferingCase]; + assert.isNotNull(ncb.loadFile(filename), `Expected to load 'hint_filename_has_differing_case.kmn' with mixed case '${filename}'`); + assertMessagesEqual(ncb.messages, expectedMessages); + } else { + // We are on a case-sensitive filesystem, so this hint can never be generated + assert.isTrue(true); + } }); // INFO_WarningsHaveFailedBuild diff --git a/developer/src/kmcmplib/include/kmcompx.h b/developer/src/kmcmplib/include/kmcompx.h index 7e7b270496..9d7ca75508 100644 --- a/developer/src/kmcmplib/include/kmcompx.h +++ b/developer/src/kmcmplib/include/kmcompx.h @@ -3,11 +3,6 @@ // TODO: merge with kmcmplib.h -typedef wchar_t KMX_WCHART; -typedef KMX_DWORD * PKMX_DWORD; -typedef char * PKMX_STR; -typedef KMX_WCHAR* PKMX_WCHAR ; - // TODO: these defines are copied out of unicode.h, because unicode.h still // has windows-specific types. These should be remerged at a future date diff --git a/developer/src/kmcmplib/src/CasedKeys.cpp b/developer/src/kmcmplib/src/CasedKeys.cpp index 0a0508f11a..0883c401ce 100644 --- a/developer/src/kmcmplib/src/CasedKeys.cpp +++ b/developer/src/kmcmplib/src/CasedKeys.cpp @@ -1,13 +1,14 @@ #include "pch.h" +#include "km_u16.h" +#include "../../../../common/windows/cpp/include/vkeys.h" + #include "compfile.h" #include "kmn_compiler_errors.h" -#include "../../../../common/windows/cpp/include/vkeys.h" #include "kmcmplib.h" #include "CharToKeyConversion.h" -#include "kmx_u16.h" #include "xstring.h" namespace kmcmp { diff --git a/developer/src/kmcmplib/src/CheckForDuplicates.cpp b/developer/src/kmcmplib/src/CheckForDuplicates.cpp index 9e5d63b9ef..e0fa0094bc 100644 --- a/developer/src/kmcmplib/src/CheckForDuplicates.cpp +++ b/developer/src/kmcmplib/src/CheckForDuplicates.cpp @@ -1,11 +1,11 @@ #include "pch.h" +#include #include "compfile.h" #include #include "kmcmplib.h" #include -#include "kmx_u16.h" #include #include "CheckForDuplicates.h" diff --git a/developer/src/kmcmplib/src/Compiler.cpp b/developer/src/kmcmplib/src/Compiler.cpp index 11c8f4a26f..3893a72855 100644 --- a/developer/src/kmcmplib/src/Compiler.cpp +++ b/developer/src/kmcmplib/src/Compiler.cpp @@ -102,7 +102,7 @@ #include "UnreachableRules.h" #include "CheckForDuplicates.h" -#include "kmx_u16.h" +#include "km_u16.h" /* These macros are adapted from winnt.h and legacy use only */ #define MAKELANGID(p, s) ((((uint16_t)(s)) << 10) | (uint16_t)(p)) @@ -580,7 +580,7 @@ KMX_BOOL ParseLine(PFILE_KEYBOARD fk, PKMX_WCHAR str) { //swprintf(tstr, "%d", fk->currentGroup); /* Record a system store for the line number of the begin statement */ //wcscpy(tstr, DEBUGSTORE_MATCH); - u16sprintf(tstr, _countof(tstr), L"%ls%d ", u16fmt(DEBUGSTORE_MATCH).c_str(), (int) fk->currentGroup); + u16sprintf(tstr, _countof(tstr), L"%ls%d ", DEBUGSTORE_MATCH_L, (int) fk->currentGroup); u16ncat(tstr, gp->szName, _countof(tstr)); AddDebugStore(fk, tstr); @@ -619,7 +619,7 @@ KMX_BOOL ParseLine(PFILE_KEYBOARD fk, PKMX_WCHAR str) { { KMX_WCHAR tstr[128]; /* Record a system store for the line number of the begin statement */ - u16sprintf(tstr, _countof(tstr), L"%ls%d ", u16fmt(DEBUGSTORE_NOMATCH).c_str(), (int) fk->currentGroup); + u16sprintf(tstr, _countof(tstr), L"%ls%d ", DEBUGSTORE_NOMATCH_L, (int) fk->currentGroup); u16ncat(tstr, gp->szName, _countof(tstr)); AddDebugStore(fk, tstr); } @@ -683,7 +683,7 @@ KMX_BOOL ProcessGroupLine(PFILE_KEYBOARD fk, PKMX_WCHAR p) { KMX_WCHAR tstr[128]; /* Record a system store for the line number of the begin statement */ - u16sprintf(tstr, _countof(tstr), L"%ls%d ", u16fmt(DEBUGSTORE_GROUP).c_str(), fk->cxGroupArray - 1); + u16sprintf(tstr, _countof(tstr), L"%ls%d ", DEBUGSTORE_GROUP_L, fk->cxGroupArray - 1); u16ncat(tstr, gp->szName, _countof(tstr)); AddDebugStore(fk, tstr); } @@ -3595,7 +3595,7 @@ KMX_DWORD ImportBitmapFile(PFILE_KEYBOARD fk, PKMX_WCHAR szName, PKMX_DWORD File return KmnCompilerMessages::ERROR_CannotReadBitmapFile; } - *FileSize = bufvec.size(); + *FileSize = static_cast(bufvec.size()); *Buf = new KMX_BYTE[*FileSize]; std::copy(bufvec.begin(), bufvec.end(), *Buf); @@ -3761,7 +3761,7 @@ void kmcmp::RecordDeadkeyNames(PFILE_KEYBOARD fk) KMX_DWORD i; for (i = 0; i < fk->cxDeadKeyArray; i++) { - u16sprintf(buf, _countof(buf), L"%ls%d ", u16fmt(DEBUGSTORE_DEADKEY).c_str(), (int)i); + u16sprintf(buf, _countof(buf), L"%ls%d ", DEBUGSTORE_DEADKEY_L, (int)i); u16ncat(buf, fk->dpDeadKeyArray[i].szName, _countof(buf)); AddDebugStore(fk, buf); @@ -3809,11 +3809,11 @@ bool UTF16TempFromUTF8(KMX_BYTE* infile, int sz, KMX_BYTE** tempfile, int *sz16) } if(hasPreamble(result)) { - *sz16 = result.size() * 2 - 2; + *sz16 = static_cast(result.size()) * 2 - 2; *tempfile = new KMX_BYTE[*sz16]; memcpy(*tempfile, result.c_str() + 1, *sz16); } else { - *sz16 = result.size() * 2; + *sz16 = static_cast(result.size()) * 2; *tempfile = new KMX_BYTE[*sz16]; memcpy(*tempfile, result.c_str(), *sz16); } diff --git a/developer/src/kmcmplib/src/CompilerInterfaces.cpp b/developer/src/kmcmplib/src/CompilerInterfaces.cpp index 11cbd95e59..ba36802832 100644 --- a/developer/src/kmcmplib/src/CompilerInterfaces.cpp +++ b/developer/src/kmcmplib/src/CompilerInterfaces.cpp @@ -38,7 +38,7 @@ EXTERN bool kmcmp_CompileKeyboard( int sz; std::vector bufvec = kmcmp::loadfileproc(pszInfile, ""); - sz = bufvec.size(); + sz = static_cast(bufvec.size()); if(!sz) { ReportCompilerMessage(KmnCompilerMessages::ERROR_InfileNotExist); return FALSE; diff --git a/developer/src/kmcmplib/src/CompilerInterfacesWasm.cpp b/developer/src/kmcmplib/src/CompilerInterfacesWasm.cpp index a857b41dce..1ddd45dd3f 100644 --- a/developer/src/kmcmplib/src/CompilerInterfacesWasm.cpp +++ b/developer/src/kmcmplib/src/CompilerInterfacesWasm.cpp @@ -75,9 +75,16 @@ struct BindingType> { using ValBinding = BindingType; using WireType = ValBinding::WireType; +#if __EMSCRIPTEN_major__ == 3 && __EMSCRIPTEN_minor__ == 1 && __EMSCRIPTEN_tiny__ >= 60 + // emscripten-core/emscripten#21692 + static WireType toWireType(const std::vector &vec, rvp::default_tag) { + return ValBinding::toWireType(val::array(vec), rvp::default_tag{}); + } +#else static WireType toWireType(const std::vector &vec) { return ValBinding::toWireType(val::array(vec)); } +#endif static std::vector fromWireType(WireType value) { return vecFromJSArray(ValBinding::fromWireType(value)); diff --git a/developer/src/kmcmplib/src/NamedCodeConstants.cpp b/developer/src/kmcmplib/src/NamedCodeConstants.cpp index 40e47d7a00..9cf322ab72 100644 --- a/developer/src/kmcmplib/src/NamedCodeConstants.cpp +++ b/developer/src/kmcmplib/src/NamedCodeConstants.cpp @@ -121,7 +121,7 @@ KMX_BOOL NamedCodeConstants::LoadFile(PFILE_KEYBOARD fk, const KMX_WCHAR *filena int FileSize; KMX_BYTE* Buf; std::vector bufvec = loadfileproc(szNameUtf8, fk->extra->kmnFilename); - FileSize = bufvec.size(); + FileSize = static_cast(bufvec.size()); if(!FileSize) { return FALSE; } diff --git a/developer/src/kmcmplib/src/UnreachableRules.cpp b/developer/src/kmcmplib/src/UnreachableRules.cpp index c84bdfb1f5..40965db4d6 100644 --- a/developer/src/kmcmplib/src/UnreachableRules.cpp +++ b/developer/src/kmcmplib/src/UnreachableRules.cpp @@ -18,7 +18,7 @@ namespace kmcmp { std::wstringstream key; key << kp->Key << "," << kp->ShiftFlags << ","; if (kp->dpContext) { - std::wstring Context_ws = u16fmt((const PKMX_WCHAR) kp->dpContext); + std::wstring Context_ws = wstring_from_u16string((const PKMX_WCHAR) kp->dpContext); key << Context_ws; } return key.str(); diff --git a/developer/src/kmcmplib/src/debugstore.h b/developer/src/kmcmplib/src/debugstore.h index c54e3b45c3..d8bd4643df 100644 --- a/developer/src/kmcmplib/src/debugstore.h +++ b/developer/src/kmcmplib/src/debugstore.h @@ -5,16 +5,16 @@ #define DEBUGSTORE_BEGIN u"B" #define DEBUGSTORE_BEGIN_C u'B' -#define DEBUGSTORE_MATCH u"M" -#define DEBUGSTORE_MATCH_C u'M' +#define DEBUGSTORE_MATCH_U u"M" +#define DEBUGSTORE_MATCH_L L"M" -#define DEBUGSTORE_NOMATCH u"N" -#define DEBUGSTORE_NOMATCH_C u'N' +#define DEBUGSTORE_NOMATCH_U u"M" +#define DEBUGSTORE_NOMATCH_L L"M" -#define DEBUGSTORE_GROUP u"G" -#define DEBUGSTORE_GROUP_C u'G' +#define DEBUGSTORE_GROUP_U u"G" +#define DEBUGSTORE_GROUP_L L"G" -#define DEBUGSTORE_DEADKEY u"D" -#define DEBUGSTORE_DEADKEY_C u'D' +#define DEBUGSTORE_DEADKEY_U u"D" +#define DEBUGSTORE_DEADKEY_L L"D" #endif /* DEBUGSTORE_H */ diff --git a/developer/src/kmcmplib/src/kmx_u16.cpp b/developer/src/kmcmplib/src/kmx_u16.cpp deleted file mode 100644 index 02e59f8c12..0000000000 --- a/developer/src/kmcmplib/src/kmx_u16.cpp +++ /dev/null @@ -1,293 +0,0 @@ - -//#include "../../kmcompx/include/kmcompx.h" -#include -#include "kmx_u16.h" - -#include -#include -#include -#include -#include -#include -#include - -//String <- wstring -std::string string_from_wstring(std::wstring const str) { - std::wstring_convert, wchar_t> converter; - return converter.to_bytes(str); -} -//wstring <- string -std::wstring wstring_from_string(std::string const str) { - std::wstring_convert, wchar_t> converter; - return converter.from_bytes(str); -} - -//u16String <- string -std::u16string u16string_from_string(std::string const str) { - std::wstring_convert, char16_t> converter; - return converter.from_bytes(str); -} - -//string <- u16string -std::string string_from_u16string(std::u16string const str) { - std::wstring_convert, char16_t> converter; - return converter.to_bytes(str); -} - -// often used with c_str() e.g. u16fmt( DEBUGSTORE_MATCH).c_str() -// UTF16 (= const char16_t*) -> UTF8 (= std::string) -> UTF16 ( = std::wstring 16 bit) -std::wstring u16fmt(const KMX_WCHAR * str) { - std::wstring_convert, wchar_t> convert_wstring; - std::wstring_convert, char16_t> convert; - - // UTF16 (= const char16_t*) -> UTF8 (= std::string) -> UTF16 ( = std::wstring 16 bit) - std::string utf8str = convert.to_bytes(str); // UTF16 (= const char16_t*) -> UTF8 (= std::string) - std::wstring wstr = convert_wstring.from_bytes(utf8str); // UTF8 (= std::string) -> UTF16 ( = std::wstring 16 bit) - return wstr; -} - -void u16sprintf(KMX_WCHAR * dst, const size_t sz, const wchar_t* fmt, ...) { - // UTF16 (=const wchar_t*) -> -> std::string -> std::u16string -> UTF16 ( = char16_t*) - wchar_t* wbuf = new wchar_t[sz]; - va_list args; - va_start(args, fmt); - vswprintf(wbuf, sz, fmt, args); - va_end(args); - - std::wstring_convert, wchar_t> convert_wstring; - std::wstring_convert, char16_t> convert; - - // UTF16 (=const wchar_t*) -> -> std::string -> std::u16string -> UTF16 ( = char16_t*) - std::string utf8str = convert_wstring.to_bytes(wbuf); // UTF16 ( = const wchar_t*) -> std::string - std::u16string u16str = convert.from_bytes(utf8str); // std::string -> std::u16string - u16ncpy(dst, u16str.c_str(), sz); // std::u16string.c_str() -> char16_t* - delete[] wbuf; -} - - std::wstring convert_pchar16T_To_wstr(KMX_WCHAR *Name){ - // convert char16_t* -> std::u16string -> std::string -> std::wstring - // char16_t* -> std::u16string - std::u16string u16str(Name); - // std::u16string -> std::string - std::string stri = string_from_u16string(u16str); - // std::string -> std::wstring - std::wstring wstr = wstring_from_string(stri); - return wstr; - } - -long int u16tol(const KMX_WCHAR* str, KMX_WCHAR** endptr, int base) -{ - auto s = string_from_u16string(str); - char* t; - long int result = strtol(s.c_str(), &t, base); - if (endptr != nullptr) *endptr = (KMX_WCHAR*)str + (t - s.c_str()); - return result; -} - -std::string toHex(int num1) { - if (num1 == 0) - return "0"; - int num = num1; - std::string s = ""; - while (num) { - int temp = num % 16; - if (temp <= 9) - s += (48 + temp); - else - s += (87 + temp); - num = num / 16; - } - std::reverse(s.begin(), s.end()); - return s; -} - -const KMX_WCHAR * u16ncat(KMX_WCHAR *dst, const KMX_WCHAR *src, size_t max) { - KMX_WCHAR* o = dst; - dst = (KMX_WCHAR*) u16chr(dst, 0); - //max -= (dst-o); - while (*src && max > 0) { - *dst++ = *src++; - max--; - } - if(max > 0) - *dst = 0; - return o; -} - -const KMX_WCHAR* u16rchr_slash(KMX_WCHAR const* Name) -{ - const KMX_WCHAR* cp = NULL; - cp = u16rchr(Name, '\\'); - if (cp == NULL) - cp = u16rchr(Name, '/'); - return cp; -} - -KMX_CHAR* strrchr_slash(KMX_CHAR* Name) -{ - KMX_CHAR* cp = NULL; - cp = strrchr(Name, '\\'); - if (cp == NULL) - cp = strrchr(Name, '/'); - return cp; -} - -// u16rchr returns last occurence of ch in p; It returns NULL if ch = '\0' and NULL if ch is not found -const KMX_WCHAR* u16rchr(const KMX_WCHAR* p, KMX_WCHAR ch) { - const KMX_WCHAR* p_end = p + u16len(p) - 1; - - if (ch == '\0') return p_end + 1; - while (p_end >= p) { - if (*p_end == ch) return p_end; - p_end--; - } - return NULL; -} - -const KMX_WCHAR * u16chr(const KMX_WCHAR *p, KMX_WCHAR ch) { - while (*p) { - if (*p == ch) return p; - p++; - } - return ch == 0 ? p : NULL; -} - -const KMX_WCHAR * u16cpy(KMX_WCHAR *dst, const KMX_WCHAR *src) { - KMX_WCHAR *o = dst; - while (*src) { - *dst++ = *src++; - } - *dst = 0; - return o; -} - -const KMX_WCHAR * u16ncpy(KMX_WCHAR *dst, const KMX_WCHAR *src, size_t max) { - KMX_WCHAR *o = dst; - while (*src && max > 0) { - *dst++ = *src++; - max--; - } - if(max > 0) { - *dst = 0; - } - return o; -} - -size_t u16len(const KMX_WCHAR *p) { - int i = 0; - while (*p) { - p++; - i++; - } - return i; -} - -int u16cmp(const KMX_WCHAR *p, const KMX_WCHAR *q) { - while (*p && *q) { - if (*p != *q) return *p - *q; - p++; - q++; - } - return *p - *q; -} - -int u16nicmp(const KMX_WCHAR *p, const KMX_WCHAR *q, size_t count) { - while (*p && *q && count) { - if (toupper(*p) != toupper(*q)) return *p - *q; - p++; - q++; - count--; - } - if (count) - return *p - *q; - return 0; -} - -int u16icmp(const KMX_WCHAR *p, const KMX_WCHAR *q) { - while (*p && *q) { - if (toupper(*p) != toupper(*q)) return *p - *q; - p++; - q++; - } - return *p - *q; -} - -int u16ncmp(const KMX_WCHAR *p, const KMX_WCHAR *q, size_t count) { - while (*p && *q && count) { - if (*p != *q) return *p - *q; - p++; - q++; - count--; - } - if (count) - return *p - *q; - return 0; -} - -KMX_WCHAR * u16tok(KMX_WCHAR *p, const KMX_WCHAR ch, KMX_WCHAR **ctx) { - if (!p) { - p = *ctx; - if (!p) return NULL; - } - - KMX_WCHAR *q = p; - while (*q && *q != ch) { - q++; - } - if (*q) { - *q = 0; - q++; - while (*q == ch) q++; - *ctx = q; - } - else { - *ctx = NULL; - } - return *p ? p : NULL; -} - -KMX_WCHAR * u16tok(KMX_WCHAR* p, const KMX_WCHAR* delim, KMX_WCHAR** ctx) { - if (!p) { - p = *ctx; - if (!p) return NULL; - } - - KMX_WCHAR * q = p; - while (*q && !u16chr(delim, *q)) { - q++; - } - if (*q) { - *q = 0; - q++; - while (*q && u16chr(delim, *q)) q++; - *ctx = q; - } - else { - *ctx = NULL; - } - return *p ? p : NULL; -} - -double u16tof( KMX_WCHAR* str) -{ - double val = 0; - int offsetdot=0; - char digit; - - PKMX_WCHAR q = (PKMX_WCHAR)u16chr(str, '.'); - size_t pos_dot = (q-str < 0) ? u16len(str) : q-str; - - for (size_t i = 0; i < u16len(str); i++) - { - digit = static_cast(towupper(*str)); - - if (i > pos_dot - 1) - offsetdot = 1; - - if (digit != '.') - val =val+ ((int(digit)) - 48) * pow(10, (pos_dot - 1- i + offsetdot)); - - str++; - } - return val; -} diff --git a/developer/src/kmcmplib/src/kmx_u16.h b/developer/src/kmcmplib/src/kmx_u16.h deleted file mode 100644 index 450c400e2f..0000000000 --- a/developer/src/kmcmplib/src/kmx_u16.h +++ /dev/null @@ -1,38 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include -#include "kmcompx.h" - -std::string string_from_wstring(std::wstring const str); -std::wstring wstring_from_string(std::string const str); -std::u16string u16string_from_string(std::string const str); -std::string string_from_u16string(std::u16string const str); - -std::wstring u16fmt(const KMX_WCHAR * str); -void u16sprintf(KMX_WCHAR * dst, const size_t sz, const wchar_t* fmt, ...) ; - -std::wstring convert_pchar16T_To_wstr(KMX_WCHAR *Name); - -size_t u16len(const KMX_WCHAR *p); -int u16cmp(const KMX_WCHAR *p, const KMX_WCHAR *q); -int u16icmp(const KMX_WCHAR *p, const KMX_WCHAR *q); -int u16ncmp(const KMX_WCHAR *p, const KMX_WCHAR *q, size_t count); -int u16nicmp(const KMX_WCHAR *p, const KMX_WCHAR *q, size_t count) ; -const KMX_WCHAR * u16ncpy(KMX_WCHAR *dst, const KMX_WCHAR *src, size_t max); -const KMX_WCHAR * u16cpy(KMX_WCHAR *dst, const KMX_WCHAR *src); -const KMX_WCHAR * u16rchr(const KMX_WCHAR *p, KMX_WCHAR ch) ; -const KMX_WCHAR * u16chr(const KMX_WCHAR *p, KMX_WCHAR ch) ; -const KMX_WCHAR * u16ncat(KMX_WCHAR *dst, const KMX_WCHAR *src, size_t max); -KMX_WCHAR * u16tok(KMX_WCHAR *p, const KMX_WCHAR ch, KMX_WCHAR **ctx) ; -KMX_WCHAR * u16tok(KMX_WCHAR* p, const KMX_WCHAR* ch, KMX_WCHAR** ctx) ; -long int u16tol(const KMX_WCHAR* str, KMX_WCHAR** endptr, int base) ; -double u16tof( KMX_WCHAR* str); - -KMX_CHAR* strrchr_slash(KMX_CHAR* Name); -const KMX_WCHAR* u16rchr_slash(KMX_WCHAR const* Name); - -std::string toHex(int num1); diff --git a/developer/src/kmcmplib/src/meson.build b/developer/src/kmcmplib/src/meson.build index 2b9a431e09..51acf70409 100644 --- a/developer/src/kmcmplib/src/meson.build +++ b/developer/src/kmcmplib/src/meson.build @@ -78,13 +78,14 @@ lib = library('kmcmplib', 'cp1252.cpp', 'DeprecationChecks.cpp', 'Edition.cpp', - 'kmx_u16.cpp', 'NamedCodeConstants.cpp', 'UnreachableRules.cpp', 'uset-api.cpp', 'versioning.cpp', 'virtualcharkeys.cpp', 'xstring.cpp', + '../../../../common/cpp/km_u16.cpp', + '../../../../common/cpp/utfcodec.cpp', '../../../../common/windows/cpp/src/ConvertUTF.c', '../../../../common/windows/cpp/src/crc32.cpp', '../../../../common/windows/cpp/src/vkeys.cpp', diff --git a/developer/src/kmcmplib/src/pch.h b/developer/src/kmcmplib/src/pch.h index 358e28998a..80bb639fb8 100644 --- a/developer/src/kmcmplib/src/pch.h +++ b/developer/src/kmcmplib/src/pch.h @@ -4,7 +4,7 @@ #define USE_CHAR16_T #include -#include "kmx_u16.h" +#include #include #include "../../../../common/windows/cpp/include/crc32.h" diff --git a/developer/src/kmcmplib/subprojects/gtest.wrap b/developer/src/kmcmplib/subprojects/gtest.wrap index adb8a9a6d9..a77eb315bf 100644 --- a/developer/src/kmcmplib/subprojects/gtest.wrap +++ b/developer/src/kmcmplib/subprojects/gtest.wrap @@ -4,7 +4,7 @@ source_url = https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar. source_filename = gtest-1.14.0.tar.gz source_hash = 8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7 patch_filename = gtest_1.14.0-2_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/gtest_1.14.0-2/get_patch +patch_url = https://github.com/mesonbuild/wrapdb/releases/download/gtest_1.14.0-2/gtest_1.14.0-2_patch.zip patch_hash = 4ec7f767364386a99f7b2d61678287a73ad6ba0f9998be43b51794c464a63732 source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/gtest_1.14.0-2/gtest-1.14.0.tar.gz wrapdb_version = 1.14.0-2 diff --git a/developer/src/kmcmplib/tests/gtest-compiler-test.cpp b/developer/src/kmcmplib/tests/gtest-compiler-test.cpp index 22b38dccc6..1c20597645 100644 --- a/developer/src/kmcmplib/tests/gtest-compiler-test.cpp +++ b/developer/src/kmcmplib/tests/gtest-compiler-test.cpp @@ -1,7 +1,7 @@ #include +#include #include "../include/kmcompx.h" #include "../include/kmcmplibapi.h" -#include "../src/kmx_u16.h" #include "../src/compfile.h" #include "../src/CompilerErrors.h" #include "../../common/include/kmn_compiler_errors.h" diff --git a/developer/src/kmcmplib/tests/gtest-kmx_u16-test.cpp b/developer/src/kmcmplib/tests/gtest-km_u16-test.cpp similarity index 94% rename from developer/src/kmcmplib/tests/gtest-kmx_u16-test.cpp rename to developer/src/kmcmplib/tests/gtest-km_u16-test.cpp index aa1dca1de0..b67957bd31 100644 --- a/developer/src/kmcmplib/tests/gtest-kmx_u16-test.cpp +++ b/developer/src/kmcmplib/tests/gtest-km_u16-test.cpp @@ -1,9 +1,9 @@ #include -#include "../src/kmx_u16.h" +#include +#include #include "../src/compfile.h" -#include "../../../../common/include/km_types.h" -TEST(kmx_u16_Test, u16chr) { +TEST(km_u16_Test, u16chr) { KMX_WCHAR str[LINESIZE]; u16cpy(str, u"abc"); @@ -14,7 +14,7 @@ TEST(kmx_u16_Test, u16chr) { EXPECT_EQ(3, u16chr(str, '\0') - str); // locate null terminator } -TEST(kmx_u16_Test, u16chr_compare_to_strchr) { +TEST(km_u16_Test, u16chr_compare_to_strchr) { // Compare behaviour of strchr: char str[LINESIZE]; @@ -26,7 +26,7 @@ TEST(kmx_u16_Test, u16chr_compare_to_strchr) { EXPECT_EQ(3, strchr(str, '\0') - str); // locate null terminator } -TEST(kmx_u16_Test, u16tok_char_delim) { +TEST(km_u16_Test, u16tok_char_delim) { // For char delimiter: KMX_WCHAR * u16tok(KMX_WCHAR *p, const KMX_WCHAR ch, KMX_WCHAR **ctx) ; KMX_WCHAR str[LINESIZE]; @@ -67,7 +67,7 @@ TEST(kmx_u16_Test, u16tok_char_delim) { EXPECT_TRUE(!u16cmp(u"def", ctx)); } -TEST(kmx_u16_Test, u16tok_str_delim) { +TEST(km_u16_Test, u16tok_str_delim) { // For string delimiter: KMX_WCHAR * u16tok(KMX_WCHAR* p, const KMX_WCHAR* ch, KMX_WCHAR** ctx) ; KMX_WCHAR str[LINESIZE]; @@ -126,7 +126,7 @@ TEST(kmx_u16_Test, u16tok_str_delim) { EXPECT_EQ(nullptr, ctx); } -TEST(kmx_u16_Test, u16tok_str_compare_to_strtok) { +TEST(km_u16_Test, u16tok_str_compare_to_strtok) { // Compare behaviour of strtok: char str[LINESIZE]; diff --git a/developer/src/kmcmplib/tests/meson.build b/developer/src/kmcmplib/tests/meson.build index a5b6476c88..65915d1e9d 100644 --- a/developer/src/kmcmplib/tests/meson.build +++ b/developer/src/kmcmplib/tests/meson.build @@ -168,7 +168,7 @@ gtestcompilertest = executable('gtest-compiler-test', 'gtest-compiler-test.cpp', test('gtest-compiler-test', gtestcompilertest) -gtestkmx_u16test = executable('gtest-kmx_u16-test', 'gtest-kmx_u16-test.cpp', +gtest_km_u16_test = executable('gtest-km_u16-test', 'gtest-km_u16-test.cpp', cpp_args: defns + flags, include_directories: inc, name_suffix: name_suffix, @@ -177,4 +177,4 @@ gtestkmx_u16test = executable('gtest-kmx_u16-test', 'gtest-kmx_u16-test.cpp', dependencies: [ icuuc_dep, gtest_dep, gmock_dep ], ) -test('gtest-kmx_u16-test', gtestkmx_u16test) +test('gtest-km_u16-test', gtest_km_u16_test) diff --git a/developer/src/kmcmplib/tests/util_filesystem.cpp b/developer/src/kmcmplib/tests/util_filesystem.cpp index 7f9edd6b36..0873ff1328 100644 --- a/developer/src/kmcmplib/tests/util_filesystem.cpp +++ b/developer/src/kmcmplib/tests/util_filesystem.cpp @@ -117,23 +117,10 @@ FILE* Open_File(const KMX_CHAR* Filename, const KMX_CHAR* mode) { #endif }; -FILE* Open_File(const KMX_WCHART* Filename, const KMX_WCHART* mode) { -#ifdef _MSC_VER - std::wstring cpath = Filename; //, cmode = mode; - std::replace(cpath.begin(), cpath.end(), '/', '\\'); - return _wfsopen(cpath.c_str(), mode, _SH_DENYWR); -#else - std::string cpath, cmode; - cpath = string_from_wstring(Filename); - cmode = string_from_wstring(mode); - return fopen_wrapper(cpath.c_str(), cmode.c_str()); -#endif -}; - FILE* Open_File(const KMX_WCHAR* Filename, const KMX_WCHAR* mode) { #ifdef _MSC_VER - std::wstring cpath = convert_pchar16T_To_wstr((KMX_WCHAR*) Filename); - std::wstring cmode = convert_pchar16T_To_wstr((KMX_WCHAR*) mode); + std::wstring cpath = wstring_from_u16string(Filename); + std::wstring cmode = wstring_from_u16string(mode); std::replace(cpath.begin(), cpath.end(), '/', '\\'); return _wfsopen(cpath.c_str(), cmode.c_str(), _SH_DENYWR); #else diff --git a/developer/src/kmcmplib/tests/util_filesystem.h b/developer/src/kmcmplib/tests/util_filesystem.h index 4c94dae6bf..c35967b05e 100644 --- a/developer/src/kmcmplib/tests/util_filesystem.h +++ b/developer/src/kmcmplib/tests/util_filesystem.h @@ -1,12 +1,11 @@ #pragma once #include -#include "../src/kmx_u16.h" +#include // Opens files on windows and non-windows platforms. Datatypes for Filename and mode must be the same. // returns FILE* if file could be opened; FILE needs to be closed in calling function FILE* Open_File(const KMX_CHAR* Filename, const KMX_CHAR* mode); -FILE* Open_File(const KMX_WCHART* Filename, const KMX_WCHART* mode); FILE* Open_File(const KMX_WCHAR* Filename, const KMX_WCHAR* mode); KMX_BOOL kmcmp_FileExists(const KMX_CHAR *filename); KMX_BOOL kmcmp_FileExists(const KMX_WCHAR *filename); diff --git a/developer/src/kmcmplib/wasm.build.linux.in b/developer/src/kmcmplib/wasm.build.linux.in index c5e61a9bda..27cb7ba68f 100644 --- a/developer/src/kmcmplib/wasm.build.linux.in +++ b/developer/src/kmcmplib/wasm.build.linux.in @@ -1,4 +1,4 @@ [binaries] -c = ['$EMSCRIPTEN_BASE/emcc.py'] -cpp = ['$EMSCRIPTEN_BASE/em++.py'] -ar = ['$EMSCRIPTEN_BASE/emar.py'] +c = ['$EMSCRIPTEN_BASE/emcc'] +cpp = ['$EMSCRIPTEN_BASE/em++'] +ar = ['$EMSCRIPTEN_BASE/emar'] diff --git a/developer/src/kmcmplib/wasm.build.mac.in b/developer/src/kmcmplib/wasm.build.mac.in index c5e61a9bda..27cb7ba68f 100644 --- a/developer/src/kmcmplib/wasm.build.mac.in +++ b/developer/src/kmcmplib/wasm.build.mac.in @@ -1,4 +1,4 @@ [binaries] -c = ['$EMSCRIPTEN_BASE/emcc.py'] -cpp = ['$EMSCRIPTEN_BASE/em++.py'] -ar = ['$EMSCRIPTEN_BASE/emar.py'] +c = ['$EMSCRIPTEN_BASE/emcc'] +cpp = ['$EMSCRIPTEN_BASE/em++'] +ar = ['$EMSCRIPTEN_BASE/emar'] diff --git a/developer/src/server/build-addins.inc.sh b/developer/src/server/build-addins.inc.sh index d48d44d1e7..052a24d77b 100644 --- a/developer/src/server/build-addins.inc.sh +++ b/developer/src/server/build-addins.inc.sh @@ -41,9 +41,10 @@ do_build_addins() { # Build node-windows-trayicon # - pushd "$KEYMAN_ROOT/node_modules/node-windows-trayicon" + pushd "$KEYMAN_ROOT/developer/src/server/src/win32/trayicon/addon-src" rm -rf build - npx node-gyp clean configure build --arch=$ARCH --silent + npm ci + "$KEYMAN_ROOT/node_modules/.bin/node-gyp" clean configure build --arch=$ARCH --silent cp build/Release/addon.node "$TRAYICON_SRC_TARGET" cp build/Release/addon.node "$TRAYICON_BIN_TARGET" popd @@ -52,9 +53,9 @@ do_build_addins() { # Build hetrodo-node-hide-console-window-napi # - pushd "$KEYMAN_ROOT/node_modules/hetrodo-node-hide-console-window-napi" + pushd "$KEYMAN_ROOT/node_modules/node-hide-console-window" rm -rf build - npx node-gyp clean configure build --arch=$ARCH --silent + "$KEYMAN_ROOT/node_modules/.bin/node-gyp" clean configure build --arch=$ARCH --silent cp build/Release/node-hide-console-window.node "$HIDECONSOLE_SRC_TARGET" cp build/Release/node-hide-console-window.node "$HIDECONSOLE_BIN_TARGET" popd diff --git a/developer/src/server/build.sh b/developer/src/server/build.sh index e053d72b96..c73ed853f7 100755 --- a/developer/src/server/build.sh +++ b/developer/src/server/build.sh @@ -87,9 +87,16 @@ function build_server() { # Post build mkdir -p "$THIS_SCRIPT_PATH/build/src/site/" - mkdir -p "$THIS_SCRIPT_PATH/build/src/win32/" cp -r "$THIS_SCRIPT_PATH/src/site/"** "$THIS_SCRIPT_PATH/build/src/site/" - cp -r "$THIS_SCRIPT_PATH/src/win32/"** "$THIS_SCRIPT_PATH/build/src/win32/" + + mkdir -p "$THIS_SCRIPT_PATH/build/src/win32/" + mkdir -p "$THIS_SCRIPT_PATH/build/src/win32/console" + mkdir -p "$THIS_SCRIPT_PATH/build/src/win32/trayicon" + cp "$THIS_SCRIPT_PATH/src/win32/README.md" "$THIS_SCRIPT_PATH/build/src/win32/" + cp "$THIS_SCRIPT_PATH/src/win32/console/node-hide-console-window.node" "$THIS_SCRIPT_PATH/build/src/win32/console/" + cp "$THIS_SCRIPT_PATH/src/win32/console/node-hide-console-window.x64.node" "$THIS_SCRIPT_PATH/build/src/win32/console/" + cp "$THIS_SCRIPT_PATH/src/win32/trayicon/addon.node" "$THIS_SCRIPT_PATH/build/src/win32/trayicon/" + cp "$THIS_SCRIPT_PATH/src/win32/trayicon/addon.x64.node" "$THIS_SCRIPT_PATH/build/src/win32/trayicon/" replaceVersionStrings "$THIS_SCRIPT_PATH/build/src/site/lib/sentry/init.js.in" "$THIS_SCRIPT_PATH/build/src/site/lib/sentry/init.js" rm "$THIS_SCRIPT_PATH/build/src/site/lib/sentry/init.js.in" @@ -114,10 +121,13 @@ function installer_server() { rm -f node_modules/ngrok/bin/ngrok.exe popd - # @keymanapp/keyman-version is required in build/ now but we need to copy it in manually + # Dependencies are required in build/ but we need to copy them in manually mkdir -p "$PRODBUILDTEMP/node_modules/@keymanapp/" cp -R "$KEYMAN_ROOT/node_modules/@keymanapp/keyman-version/" "$PRODBUILDTEMP/node_modules/@keymanapp/" cp -R "$KEYMAN_ROOT/node_modules/@keymanapp/developer-utils/" "$PRODBUILDTEMP/node_modules/@keymanapp/" + cp -R "$KEYMAN_ROOT/node_modules/@keymanapp/common-types/" "$PRODBUILDTEMP/node_modules/@keymanapp/" + cp -R "$KEYMAN_ROOT/node_modules/@keymanapp/ldml-keyboard-constants/" "$PRODBUILDTEMP/node_modules/@keymanapp/" + cp -R "$KEYMAN_ROOT/node_modules/eventemitter3/" "$PRODBUILDTEMP/node_modules/" # We'll build in the $KEYMAN_ROOT/developer/bin/server/ folder rm -rf "$KEYMAN_ROOT/developer/bin/server/" @@ -144,8 +154,8 @@ function publish_server() { builder_run_action clean:server clean_server builder_run_action configure:server configure_server -builder_run_action build:server build_server builder_run_action build:addins build_addins +builder_run_action build:server build_server builder_run_action test:server test_server # builder_run_action test:addins # no op builder_run_action installer:server installer_server # TODO: rename to install-prep diff --git a/developer/src/server/package.json b/developer/src/server/package.json index c4c195ae1b..f3be3425f2 100644 --- a/developer/src/server/package.json +++ b/developer/src/server/package.json @@ -16,11 +16,14 @@ "multer": "^1.4.5-lts.1", "ngrok": "^5.0.0-beta.2", "open": "^8.4.0", - "ws": "^8.17.1" - }, + "restructure": "^3.0.1", + "sax": ">=0.6.0", + "semver": "^7.5.4", + "ws": "^8.17.1", + "xmlbuilder": "~11.0.0" +}, "optionalDependencies": { - "hetrodo-node-hide-console-window-napi": "keymanapp/hetrodo-node-hide-console-window-napi#keyman-15.0", - "node-windows-trayicon": "keymanapp/node-windows-trayicon#keyman-16.0" + "node-hide-console-window": "^2.2.0" }, "devDependencies": { "@keymanapp/keyman-version": "*", @@ -32,6 +35,7 @@ "@types/ws": "^8.2.2", "copyfiles": "^2.4.1", "mocha": "^10.0.0", + "node-gyp": "^10.2.0", "tsc-watch": "^4.5.0", "typescript": "^5.4.5" } diff --git a/developer/src/server/src/win32/trayicon/README.md b/developer/src/server/src/win32/trayicon/README.md index 2a6dfcff37..9dbc4b19f5 100644 --- a/developer/src/server/src/win32/trayicon/README.md +++ b/developer/src/server/src/win32/trayicon/README.md @@ -8,3 +8,8 @@ bundled libraries target for specific versions of node. * Tree: https://github.com/mceSystems/node-windows-trayicon/tree/cbd7543ac186ca15ee8d7141aac43f26ceae1655 * License: MIT * Built from: /developer/src/server/win32/node-windows-trayicon + +--- + +The source for trayicon is currently in addon-src, as the original package is +unmaintained. \ No newline at end of file diff --git a/developer/src/server/src/win32/trayicon/addon-src/.gitignore b/developer/src/server/src/win32/trayicon/addon-src/.gitignore new file mode 100644 index 0000000000..c6bf5be1c7 --- /dev/null +++ b/developer/src/server/src/win32/trayicon/addon-src/.gitignore @@ -0,0 +1,62 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# Typescript v1 declaration files +typings/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + +.vscode +build/ +test/icon.ico \ No newline at end of file diff --git a/developer/src/server/src/win32/trayicon/addon-src/LICENSE b/developer/src/server/src/win32/trayicon/addon-src/LICENSE new file mode 100644 index 0000000000..454c5bc10a --- /dev/null +++ b/developer/src/server/src/win32/trayicon/addon-src/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018 mceSystems + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/developer/src/server/src/win32/trayicon/addon-src/README.md b/developer/src/server/src/win32/trayicon/addon-src/README.md new file mode 100644 index 0000000000..6c429beb59 --- /dev/null +++ b/developer/src/server/src/win32/trayicon/addon-src/README.md @@ -0,0 +1,57 @@ +# windows-trayicon +Native addon to add a windows tray icon with menu, built on windows-native libraries (no .NET dependency) + +# Installation +``` +npm install --save windows-trayicon +``` + +# Usage +``` +const WindowsTrayicon = require("windows-trayicon"); +const path = require("path"); +const fs = require("fs"); + +const myTrayApp = new WindowsTrayicon({ + title: "Trayicon Test", + icon: path.resolve(__dirname, "icon.ico"), + menu: [ + { + id: "item-1-id", + caption: "First Item" + }, + { + id: "item-2-id", + caption: "Second Item" + }, + { + id: "item-3-id-exit", + caption: "Exit" + } + ] +}); + +myTrayApp.item((id) => { + console.log(`Menu id selected=${id}`); + switch (id) { + case "item-1-id": { + console.log("First item selected..."); + break; + } + case "item-2-id": { + myTrayApp.balloon("Hello There!", "This is my message to you").then(() => { + console.log("Balloon clicked"); + }) + break; + } + case "item-3-id-exit": { + myTrayApp.exit(); + process.exit(0) + break; + } + } +}); + +process.stdin.resume() + +``` \ No newline at end of file diff --git a/developer/src/server/src/win32/trayicon/addon-src/TrayIcon.cpp b/developer/src/server/src/win32/trayicon/addon-src/TrayIcon.cpp new file mode 100644 index 0000000000..549ff935e3 --- /dev/null +++ b/developer/src/server/src/win32/trayicon/addon-src/TrayIcon.cpp @@ -0,0 +1,512 @@ +/* +* Copyright (c) Istvan Pasztor +* This source has been published on www.codeproject.com under the CPOL license. +*/ +#include "stdafx.h" +#include "TrayIcon.h" +#include + +#define TRAY_WINDOW_MESSAGE (WM_USER + 100) + +namespace +{ +// A map that never holds allocated memory when it is empty. This map will be created with placement new as a static variable, +// and its destructor will be never called, and it shouldn't leak memory if it contains no items at program exit. +// This dirty trick is useful when you create your trayicon object as static. In this case we can not control the +// order of destruction of this map object and the static trayicon object. However this dirty trick ensures that +// the map is freed exactly when the destructor of the last static trayicon is unregistering itself. +class CIdToTrayIconMap +{ + public: + typedef UINT KeyType; + typedef CTrayIcon *ValueType; + + // typedef didn't work with VC++6 + struct StdMap : public std::map + { + }; + typedef StdMap::iterator iterator; + + CIdToTrayIconMap() : m_Empty(true) {} + ValueType &operator[](KeyType k) + { + return GetOrCreateStdMap()[k]; + } + ValueType *find(KeyType k) + { + if (m_Empty) + return false; + StdMap::iterator it = GetStdMap().find(k); + if (it == GetStdMap().end()) + return NULL; + return &it->second; + } + int erase(KeyType k) + { + if (m_Empty) + return 0; + StdMap &m = GetStdMap(); + int res = (int)m.erase(k); + if (m.empty()) + { + m.~StdMap(); + m_Empty = true; + } + return res; + } + bool empty() const + { + return m_Empty; + } + // Call this only when the container is not empty!!! + iterator begin() + { + assert(!m_Empty); // Call this only when the container is not empty!!! + return m_Empty ? iterator() : GetStdMap().begin(); + } + // Call this only when the container is not empty!!! + iterator end() + { + assert(!m_Empty); // Call this only when the container is not empty!!! + return m_Empty ? iterator() : GetStdMap().end(); + } + + private: + StdMap &GetStdMap() + { + assert(!m_Empty); + return (StdMap &)m_MapBuffer; + } + StdMap &GetOrCreateStdMap() + { + if (m_Empty) + { + new ((void *)&m_MapBuffer) StdMap(); + m_Empty = false; + } + return (StdMap &)m_MapBuffer; + } + + private: + bool m_Empty; + char m_MapBuffer[sizeof(StdMap)]; +}; + +static CIdToTrayIconMap &GetIdToTrayIconMap() +{ + // This hack prevents running the destructor of our map, so it isn't problem if someone tries to reach this from a static destructor. + // Because of using MyMap this will not cause a memory leak if the user removes all items from the container before exiting. + static char id_to_tray_icon_buffer[sizeof(CIdToTrayIconMap)]; + static bool initialized = false; + if (!initialized) + { + initialized = true; + new ((void *)id_to_tray_icon_buffer) CIdToTrayIconMap(); + } + return (CIdToTrayIconMap &)id_to_tray_icon_buffer; +} + +static UINT GetNextTrayIconId() +{ + static UINT next_id = 1; + return next_id++; +} +} + +void CallJsWithOptionalString(Napi::Env env, Function callback, Context *context, std::string* data) { + if (env != nullptr) { + if (callback != nullptr) { + if (data) { + callback.Call(context->Value(), { String::New(env, *data) }); + } else { + callback.Call(context->Value(), {}); + } + + } + } + if (data != nullptr) { + delete data; + } +} + +static const UINT g_WndMsgTaskbarCreated = RegisterWindowMessage(TEXT("TaskbarCreated")); +LRESULT CALLBACK CTrayIcon::MessageProcessorWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (uMsg == TRAY_WINDOW_MESSAGE) + { + if (CTrayIcon **ppIcon = GetIdToTrayIconMap().find((UINT)wParam)) + (*ppIcon)->OnMessage((UINT)lParam); + return 0; + } + else if (uMsg == g_WndMsgTaskbarCreated) + { + CIdToTrayIconMap &id_to_tray = GetIdToTrayIconMap(); + if (!id_to_tray.empty()) + { + for (std::map::const_iterator it = id_to_tray.begin(), eit = id_to_tray.end(); it != eit; ++it) + { + CTrayIcon *pTrayIcon = it->second; + pTrayIcon->OnTaskbarCreated(); + } + } + } + return DefWindowProc(hWnd, uMsg, wParam, lParam); +} + +HWND CTrayIcon::GetMessageProcessorHWND() +{ + static HWND hWnd = NULL; + if (!hWnd) + { + static const TCHAR TRAY_ICON_MESSAGE_PROCESSOR_WND_CLASSNAME[] = TEXT("TRAY_ICON_MESSAGE_PROCESSOR_WND_CLASS"); + HINSTANCE hInstance = (HINSTANCE)GetModuleHandle(NULL); + + WNDCLASSEX wc; + wc.cbSize = sizeof(wc); + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hIcon = LoadIcon(NULL, IDI_WINLOGO); + wc.hIconSm = NULL; + wc.hInstance = hInstance; + wc.lpfnWndProc = MessageProcessorWndProc; + wc.lpszClassName = TRAY_ICON_MESSAGE_PROCESSOR_WND_CLASSNAME; + wc.lpszMenuName = NULL; + wc.style = 0; + if (!RegisterClassEx(&wc)) + return NULL; + + hWnd = CreateWindowEx( + 0, + TRAY_ICON_MESSAGE_PROCESSOR_WND_CLASSNAME, + TEXT("TRAY_ICON_MESSAGE_PROCESSOR_WND"), + WS_POPUP, + 0, 0, 0, 0, + NULL, + NULL, + hInstance, + NULL); + } + return hWnd; +} + +CTrayIcon::CTrayIcon(const char *name, bool visible, HICON hIcon, bool destroy_icon_in_destructor) + : m_Id(GetNextTrayIconId()), m_Name(name), m_hIcon(hIcon), m_Visible(false), m_DestroyIconInDestructor(destroy_icon_in_destructor), m_pOnMessageFunc(NULL), m_pListener(NULL) +{ + GetIdToTrayIconMap()[m_Id] = this; + SetVisible(visible); +} + +CTrayIcon::~CTrayIcon() +{ + SetVisible(false); + SetIcon(NULL, m_DestroyIconInDestructor); + GetIdToTrayIconMap().erase(m_Id); +} + +HICON CTrayIcon::InternalGetIcon() const +{ + return m_hIcon ? m_hIcon : ::LoadIcon(NULL, IDI_APPLICATION); +} + +bool CTrayIcon::AddIcon() +{ + NOTIFYICONDATAA data; + FillNotifyIconData(data); + data.uFlags |= NIF_MESSAGE | NIF_ICON | NIF_TIP; + data.uCallbackMessage = TRAY_WINDOW_MESSAGE; + data.hIcon = InternalGetIcon(); + + size_t tip_len = max(sizeof(data.szTip) - 1, strlen(m_Name.c_str())); + memcpy(data.szTip, m_Name.c_str(), tip_len); + data.szTip[tip_len] = 0; + + return FALSE != Shell_NotifyIconA(NIM_ADD, &data); +} + +bool CTrayIcon::RemoveIcon() +{ + NOTIFYICONDATAA data; + FillNotifyIconData(data); + return FALSE != Shell_NotifyIconA(NIM_DELETE, &data); +} + +void CTrayIcon::OnTaskbarCreated() +{ + if (m_Visible) + AddIcon(); +} + +void CTrayIcon::SetName(const char *name) +{ + m_Name = name; + if (m_Visible) + { + NOTIFYICONDATAA data; + FillNotifyIconData(data); + data.uFlags |= NIF_TIP; + + size_t tip_len = max(sizeof(data.szTip) - 1, strlen(name)); + memcpy(data.szTip, name, tip_len); + data.szTip[tip_len] = 0; + + Shell_NotifyIconA(NIM_MODIFY, &data); + } +} + +bool CTrayIcon::SetVisible(bool visible) +{ + if (m_Visible == visible) + return true; + m_Visible = visible; + if (m_Visible) + return AddIcon(); + return RemoveIcon(); +} + +void CTrayIcon::SetIcon(HICON hNewIcon, bool destroy_current_icon) +{ + if (m_hIcon == hNewIcon) + return; + if (destroy_current_icon && m_hIcon) + DestroyIcon(m_hIcon); + m_hIcon = hNewIcon; + + if (m_Visible) + { + NOTIFYICONDATAA data; + FillNotifyIconData(data); + data.uFlags |= NIF_ICON; + data.hIcon = InternalGetIcon(); + Shell_NotifyIconA(NIM_MODIFY, &data); + } +} + +bool CTrayIcon::ShowBalloonTooltip(const char *title, const char *msg, ETooltipIcon icon) +{ +#ifndef NOTIFYICONDATA_V2_SIZE + return false; +#else + if (!m_Visible) + return false; + + NOTIFYICONDATAA data; + FillNotifyIconData(data); + data.cbSize = NOTIFYICONDATAA_V2_SIZE; // win2k and later + data.uFlags |= NIF_INFO; + data.dwInfoFlags = icon; + data.uTimeout = 10000; // deprecated as of Windows Vista, it has a min(10000) and max(30000) value on previous Windows versions. + + strcpy_s(data.szInfoTitle, title); + strcpy_s(data.szInfo, msg); + + return FALSE != Shell_NotifyIconA(NIM_MODIFY, &data); +#endif +} + +void CTrayIcon::OnMessage(UINT uMsg) +{ + if (m_pOnMessageFunc) + m_pOnMessageFunc(this, uMsg); + if (m_pListener) + m_pListener->OnTrayIconMessage(this, uMsg); +} + +void CTrayIcon::FillNotifyIconData(NOTIFYICONDATAA &data) +{ + memset(&data, 0, sizeof(data)); + // the basic functions need only V1 +#ifdef NOTIFYICONDATA_V1_SIZE + data.cbSize = NOTIFYICONDATA_V1_SIZE; +#else + data.cbSize = sizeof(data); +#endif + data.hWnd = GetMessageProcessorHWND(); + assert(data.hWnd); + data.uID = m_Id; +} + +void TrayOnMessage(CTrayIcon *pTrayIcon, UINT uMsg) +{ + switch (uMsg) + { + case WM_LBUTTONUP: + case WM_RBUTTONUP: + ((CTrayIconContainer *)pTrayIcon->GetUserData())->PopupMenu(); + break; + + case NIN_BALLOONUSERCLICK: + ((CTrayIconContainer *)pTrayIcon->GetUserData())->BalloonClick(); + break; + } +} + +HICON GetIconHandle(std::string iconPath) +{ + return (HICON)LoadImage(NULL, iconPath.c_str(), IMAGE_ICON, 0, 0, LR_LOADFROMFILE | LR_DEFAULTSIZE | LR_SHARED); +} + + +CTrayIconContainer::CTrayIconContainer(const CallbackInfo& info) : ObjectWrap(info), m_OnBalloonClick(nullptr), m_OnMenuItem(nullptr) {} + +Object CTrayIconContainer::Init(Napi::Env env, Object exports){ + Function func = + DefineClass(env, + "CTrayIconContainer", + { + InstanceMethod("Start", &CTrayIconContainer::Start), + InstanceMethod("SetIconPath", &CTrayIconContainer::SetIconPath), + InstanceMethod("SetTitle", &CTrayIconContainer::SetTitle), + InstanceMethod("Stop", &CTrayIconContainer::Stop), + InstanceMethod("AddMenuItem", &CTrayIconContainer::AddMenuItem), + InstanceMethod("OnMenuItem", &CTrayIconContainer::OnMenuItem), + InstanceMethod("ShowBalloon", &CTrayIconContainer::ShowBalloon), + } + ); + + FunctionReference* constructor = new FunctionReference(); + *constructor = Napi::Persistent(func); + env.SetInstanceData(constructor); + + exports.Set("CTrayIconContainer", func); + return exports; +} + +void CTrayIconContainer::Stop(const CallbackInfo& info) +{ + if (m_OnMenuItem) { + m_OnMenuItem.Release(); + m_OnMenuItem = nullptr; + } + if (m_OnBalloonClick) { + m_OnBalloonClick.Release(); + m_OnBalloonClick = nullptr; + } + PostThreadMessage(GetThreadId(m_worker->native_handle()), WM_QUIT, NULL, NULL); + m_worker->join(); + delete m_worker; + m_worker = nullptr; + m_tray.SetVisible(false); +} + +LRESULT CALLBACK pWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return DefWindowProc(hWnd, uMsg, wParam, lParam); +} + +void CTrayIconContainer::SetIconPath(const CallbackInfo& info) +{ + std::string iconPath = info[0].As(); + m_tray.SetIcon(GetIconHandle(iconPath)); +} +void CTrayIconContainer::SetTitle(const CallbackInfo& info) +{ + std::string title = info[0].As(); + m_tray.SetName(title.c_str()); +} +void CTrayIconContainer::Start(const CallbackInfo& info) +{ + HANDLE ready = CreateEvent(nullptr, true, false, nullptr); + + m_worker = new std::thread([this, ready] { + m_tray.SetUserData(this); + m_tray.SetVisible(true); + m_tray.SetListener(TrayOnMessage); + + SetEvent(ready); + + static const TCHAR *class_name = TEXT("MCE_HWND_MESSAGE"); + WNDCLASSEX wx = {}; + wx.cbSize = sizeof(WNDCLASSEX); + wx.lpfnWndProc = pWndProc; + wx.hInstance = 0; + wx.lpszClassName = class_name; + RegisterClassEx(&wx); + m_hwnd = CreateWindowEx(0, class_name, TEXT("MCE_HWND_MESSAGE"), 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL); + + MSG msg; + while (GetMessage(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + DestroyWindow(m_hwnd); + + return 0; + }); + + WaitForSingleObject(ready, INFINITE); + CloseHandle(ready); +} + +void CTrayIconContainer::BalloonClick() +{ + m_OnBalloonClick.BlockingCall(nullptr); +} + +void CTrayIconContainer::PopupMenu() +{ + POINT pt; + if (GetCursorPos(&pt)) + { + HMENU menu = CreatePopupMenu(); + int i = 1; + for (auto const &item : m_menuItems) + { + if(item.m_caption == "-") + { + AppendMenuA(menu, MF_SEPARATOR, -1, NULL); + } + else + { + AppendMenuA(menu, MF_STRING, i, item.m_caption.c_str()); + } + i++; + } + + HWND activeHwnd = GetForegroundWindow(); + SetForegroundWindow(m_hwnd); + UINT cmd = TrackPopupMenu(menu, TPM_RETURNCMD | TPM_RIGHTBUTTON, pt.x, pt.y, 0, m_hwnd, NULL); + PostMessage(m_hwnd, WM_NULL, 0, 0); + SetForegroundWindow(activeHwnd); + if(cmd > 0) { + m_OnMenuItem.BlockingCall(new std::string(m_menuItems[cmd-1].m_id)); + } + } +} + +void CTrayIconContainer::AddMenuItem(const CallbackInfo& info) +{ + std::string id = info[0].As(); + std::string caption = info[1].As(); + m_menuItems.push_back(CTrayIconMenuItem(id, caption)); +} + +void CTrayIconContainer::OnMenuItem(const CallbackInfo& info) +{ + Function cb = info[0].As(); + Context *context = new Reference(Persistent(info.This())); + if (m_OnMenuItem) { + m_OnMenuItem.Release(); + } + m_OnMenuItem = TSFNOptString::New(info.Env(), cb, "wintrayicon_OnMenuItem", 0, 1, context); +} + +void CTrayIconContainer::ShowBalloon(const CallbackInfo& info) +{ + std::string title = info[0].As(); + std::string text = info[1].As(); + int timeout = info[2].As(); + Function cb = info[3].As(); + + Context *context = new Reference(Persistent(info.This())); + + if (m_OnBalloonClick) { + m_OnBalloonClick.Release(); + } + + m_OnBalloonClick = TSFNOptString::New(info.Env(), cb, "wintrayicon_ShowBalloon", 0, 1, context); + m_tray.ShowBalloonTooltip(title.c_str(), text.c_str()); +} diff --git a/developer/src/server/src/win32/trayicon/addon-src/TrayIcon.h b/developer/src/server/src/win32/trayicon/addon-src/TrayIcon.h new file mode 100644 index 0000000000..ee0c85561e --- /dev/null +++ b/developer/src/server/src/win32/trayicon/addon-src/TrayIcon.h @@ -0,0 +1,193 @@ +/* +* Copyright (c) Istvan Pasztor +* This source has been published on www.codeproject.com under the CPOL license. +*/ +#ifndef __TRAY_ICON_H__ +#define __TRAY_ICON_H__ +#pragma once + +// NOTE: include the following headers in your stdafx.h: +#include +#include +#include +#include +#include +#include +#include +#include +#include "napi.h" + +using namespace Napi; + +using Context = Reference; +void CallJsWithOptionalString(Napi::Env env, Function callback, Context *context, std::string* data); +using TSFNOptString = TypedThreadSafeFunction; + +struct ITrayIconListener; + +class CTrayIconMenuItem +{ +public: + CTrayIconMenuItem(std::string id, std::string caption) : + m_id(id), m_caption(caption) {} + + std::string m_id; + std::string m_caption; +}; + + +// You can use this class either by inheriting from it and overriding the OnMessage() method, +// or by instantiating this class directly and setting its listener object or function. +class CTrayIcon +{ +public: + CTrayIcon(const char* name="tray_icon", bool visible=false, HICON hIcon=NULL, bool destroy_icon_in_destructor=false); + // destroys the current m_hIcon if set + virtual ~CTrayIcon(); + + virtual void SetName(const char* name); + const char* GetName() const { return m_Name.c_str(); } + + virtual bool SetVisible(bool visible); + bool IsVisible() const { return m_Visible; } + + // The destructor may destroy the specified hIcon. If you want to avoid that, call + // SetIcon(NULL, false) or SetDestroyIconInDestructor(false). + virtual void SetIcon(HICON hNewIcon, bool destroy_current_icon=true); + HICON GetIcon() const { return m_hIcon; } + + void SetDestroyIconInDestructor(bool b) { m_DestroyIconInDestructor = b; } + bool GetDestroyIconInDestructor() const { return m_DestroyIconInDestructor; } + + enum ETooltipIcon + { + eTI_None, // NIIF_NONE(0) + eTI_Info, // NIIF_INFO(1) + eTI_Warning, // NIIF_WARNING(2) + eTI_Error // NIIF_ERROR(3) + }; + // ShowBalloonTooltip() works only on win2k and later + bool ShowBalloonTooltip(const char* title, const char* msg, ETooltipIcon icon=eTI_None); + + typedef void (*POnMessageFunc)(CTrayIcon* pTrayIcon, UINT uMsg); + void SetListener(POnMessageFunc pOnMessageFunc) { m_pOnMessageFunc = pOnMessageFunc; } + void SetListener(ITrayIconListener *pListener) { m_pListener = pListener; } + void SetUserData(const void* UserData) { m_userData = UserData; } + const void* GetUserData() { return m_userData; } + +protected: + // uMsg can be one of the following window messages: + // - WM_MOUSEMOVE + // - WM_LBUTTONDOWN, WM_LBUTTONUP, WM_LBUTTONDBLCLK + // - WM_RBUTTONDOWN, WM_RBUTTONUP, WM_RBUTTONDBLCLK + // - WM_MBUTTONDOWN, WM_MBUTTONUP, WM_MBUTTONDBLCLK + // WinXP and later: + // - NIN_BALLOONXXX messages (eg.: NIN_BALLOONUSERCLICK) + // + // Use GetCursorPos() if you need the location of the cursor. + // The default implementation calls the listener. + virtual void OnMessage(UINT uMsg); + +private: + void FillNotifyIconData(NOTIFYICONDATAA& data); + // Never returns NULL! If GetIcon()==NULL, then this returns a system icon + HICON InternalGetIcon() const; + bool AddIcon(); + bool RemoveIcon(); + void OnTaskbarCreated(); + +private: + UINT m_Id; + std::string m_Name; + bool m_Visible; + HICON m_hIcon; + bool m_DestroyIconInDestructor; + POnMessageFunc m_pOnMessageFunc; + ITrayIconListener* m_pListener; + + static LRESULT CALLBACK MessageProcessorWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + static HWND GetMessageProcessorHWND(); + const void* m_userData; +}; + + +//------------------------------------------------------------------------------------------------- + + +struct ITrayIconListener +{ + virtual void OnTrayIconMouseMove(CTrayIcon* pTrayIcon) {} + + virtual void OnTrayIconLButtonDown(CTrayIcon* pTrayIcon) {} + virtual void OnTrayIconLButtonUp(CTrayIcon* pTrayIcon) {} + virtual void OnTrayIconLButtonDblClk(CTrayIcon* pTrayIcon) {} + + virtual void OnTrayIconRButtonDown(CTrayIcon* pTrayIcon) {} + virtual void OnTrayIconRButtonUp(CTrayIcon* pTrayIcon) {} + virtual void OnTrayIconRButtonDblClk(CTrayIcon* pTrayIcon) {} + + virtual void OnTrayIconMButtonDown(CTrayIcon* pTrayIcon) {} + virtual void OnTrayIconMButtonUp(CTrayIcon* pTrayIcon) {} + virtual void OnTrayIconMButtonDblClk(CTrayIcon* pTrayIcon) {} + + // WinXP and later + virtual void OnTrayIconSelect(CTrayIcon* pTrayIcon) {} + virtual void OnTrayIconBalloonShow(CTrayIcon* pTrayIcon) {} + virtual void OnTrayIconBalloonHide(CTrayIcon* pTrayIcon) {} + virtual void OnTrayIconBalloonTimeout(CTrayIcon* pTrayIcon) {} + virtual void OnTrayIconBalloonUserClick(CTrayIcon* pTrayIcon) {} + + // Use GetCursorPos() if you need the location of the cursor. + virtual void OnTrayIconMessage(CTrayIcon* pTrayIcon, UINT uMsg) + { + switch (uMsg) + { + case WM_MOUSEMOVE: OnTrayIconMouseMove(pTrayIcon); break; + case WM_LBUTTONDOWN: OnTrayIconLButtonDown(pTrayIcon); break; + case WM_LBUTTONUP: OnTrayIconLButtonUp(pTrayIcon); break; + case WM_LBUTTONDBLCLK: OnTrayIconLButtonDblClk(pTrayIcon); break; + case WM_RBUTTONDOWN: OnTrayIconRButtonDown(pTrayIcon); break; + case WM_RBUTTONUP: OnTrayIconRButtonUp(pTrayIcon); break; + case WM_RBUTTONDBLCLK: OnTrayIconRButtonDblClk(pTrayIcon); break; + case WM_MBUTTONDOWN: OnTrayIconMButtonDown(pTrayIcon); break; + case WM_MBUTTONUP: OnTrayIconMButtonUp(pTrayIcon); break; + case WM_MBUTTONDBLCLK: OnTrayIconMButtonDblClk(pTrayIcon); break; + +#ifdef NIN_SELECT + case NIN_SELECT: OnTrayIconSelect(pTrayIcon); break; + case NIN_BALLOONSHOW: OnTrayIconBalloonShow(pTrayIcon); break; + case NIN_BALLOONHIDE: OnTrayIconBalloonHide(pTrayIcon); break; + case NIN_BALLOONTIMEOUT: OnTrayIconBalloonTimeout(pTrayIcon); break; + case NIN_BALLOONUSERCLICK: OnTrayIconBalloonUserClick(pTrayIcon); break; +#endif + } + } +}; + + + +class CTrayIconContainer : public ObjectWrap +{ +public: + CTrayIconContainer(const CallbackInfo& info); + static Object Init(Napi::Env env, Object exports); + void Start(const CallbackInfo& info); + void SetIconPath(const CallbackInfo& info); + void SetTitle(const CallbackInfo& info); + void AddMenuItem(const CallbackInfo& info); + void OnMenuItem(const CallbackInfo& info); + void ShowBalloon(const CallbackInfo& info); + void Stop(const CallbackInfo& info); + void PopupMenu(); + void BalloonClick(); + +private: + CTrayIcon m_tray; + std::thread* m_worker; + HWND m_hwnd; + std::vector m_menuItems; + TSFNOptString m_OnMenuItem; + TSFNOptString m_OnBalloonClick; +}; + +#endif //!__TRAY_ICON_H__ diff --git a/developer/src/server/src/win32/trayicon/addon-src/TrayWrapper.cpp b/developer/src/server/src/win32/trayicon/addon-src/TrayWrapper.cpp new file mode 100644 index 0000000000..5ff13e6a04 --- /dev/null +++ b/developer/src/server/src/win32/trayicon/addon-src/TrayWrapper.cpp @@ -0,0 +1,8 @@ +#include "TrayIcon.h" + +Object Init(Env env, Object exports) { + CTrayIconContainer::Init(env, exports); + return exports; +} + +NODE_API_MODULE(addon, Init) \ No newline at end of file diff --git a/developer/src/server/src/win32/trayicon/addon-src/binding.gyp b/developer/src/server/src/win32/trayicon/addon-src/binding.gyp new file mode 100644 index 0000000000..b560112b45 --- /dev/null +++ b/developer/src/server/src/win32/trayicon/addon-src/binding.gyp @@ -0,0 +1,23 @@ +{ + "targets": [ + { + "target_name": "addon", + "conditions": [ + ['OS=="win"', { + "sources": [ + "TrayWrapper.cpp", + "TrayIcon.cpp" + ], + "include_dirs": [ + " { + for (const cb of this.__itemCallbacks) { + cb(id); + } + }) + this.__nativeTray.SetTitle(this.__trayTitle); + if(this.__icon && "string" === typeof this.__icon){ + this.__nativeTray.SetIconPath(this.__icon); + } + this.__nativeTray.Start(); + } + item(cb) { + if ("function" === typeof cb) { + this.__itemCallbacks.push(cb); + } + } + balloon(title, text, timeout = 5000) { + return new Promise((resolve) => { + this.__nativeTray.ShowBalloon(title, text, timeout, () => { + resolve(); + }) + }); + } + exit() { + this.__nativeTray.Stop(); + } +} + +module.exports = WindowsTrayicon; diff --git a/developer/src/server/src/win32/trayicon/addon-src/package-lock.json b/developer/src/server/src/win32/trayicon/addon-src/package-lock.json new file mode 100644 index 0000000000..d16aad04aa --- /dev/null +++ b/developer/src/server/src/win32/trayicon/addon-src/package-lock.json @@ -0,0 +1,1905 @@ +{ + "name": "windows-trayicon", + "version": "3.0.0", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "name": "windows-trayicon", + "version": "3.0.0", + "hasInstallScript": true, + "license": "MIT", + "os": [ + "win32" + ], + "dependencies": { + "bindings": "^1.5.0", + "node-addon-api": "^3.1.0", + "node-gyp": "^10.2.0" + } + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@npmcli/agent": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz", + "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==", + "dependencies": { + "agent-base": "^7.1.0", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.1", + "lru-cache": "^10.0.1", + "socks-proxy-agent": "^8.0.3" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/fs": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", + "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/abbrev": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", + "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/agent-base": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", + "dependencies": { + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "dependencies": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "node_modules/bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "dependencies": { + "file-uri-to-path": "1.0.0" + } + }, + "node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/cacache": { + "version": "18.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz", + "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==", + "dependencies": { + "@npmcli/fs": "^3.1.0", + "fs-minipass": "^3.0.0", + "glob": "^10.2.2", + "lru-cache": "^10.0.1", + "minipass": "^7.0.3", + "minipass-collect": "^2.0.1", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "p-map": "^4.0.0", + "ssri": "^10.0.0", + "tar": "^6.1.11", + "unique-filename": "^3.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "engines": { + "node": ">=10" + } + }, + "node_modules/clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "engines": { + "node": ">=6" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/cross-spawn/node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + }, + "node_modules/cross-spawn/node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/debug": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" + }, + "node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + }, + "node_modules/encoding": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "optional": true, + "dependencies": { + "iconv-lite": "^0.6.2" + } + }, + "node_modules/env-paths": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz", + "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==", + "engines": { + "node": ">=6" + } + }, + "node_modules/err-code": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==" + }, + "node_modules/exponential-backoff": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", + "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==" + }, + "node_modules/file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==" + }, + "node_modules/foreground-child": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz", + "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" + }, + "node_modules/http-cache-semantics": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" + }, + "node_modules/http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/https-proxy-agent": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", + "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", + "dependencies": { + "agent-base": "^7.0.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "optional": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/ip-address": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", + "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", + "dependencies": { + "jsbn": "1.1.0", + "sprintf-js": "^1.1.3" + }, + "engines": { + "node": ">= 12" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-lambda": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", + "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==" + }, + "node_modules/isexe": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", + "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", + "engines": { + "node": ">=16" + } + }, + "node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/jsbn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", + "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==" + }, + "node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" + }, + "node_modules/make-fetch-happen": { + "version": "13.0.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz", + "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==", + "dependencies": { + "@npmcli/agent": "^2.0.0", + "cacache": "^18.0.0", + "http-cache-semantics": "^4.1.1", + "is-lambda": "^1.0.1", + "minipass": "^7.0.2", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "proc-log": "^4.2.0", + "promise-retry": "^2.0.1", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/minipass-collect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", + "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/minipass-fetch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", + "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/minipass-flush": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", + "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minipass-flush/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-pipeline": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", + "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-pipeline/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-sized": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", + "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-sized/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "node_modules/negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/node-addon-api": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz", + "integrity": "sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==" + }, + "node_modules/node-gyp": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz", + "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==", + "dependencies": { + "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", + "glob": "^10.3.10", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^13.0.0", + "nopt": "^7.0.0", + "proc-log": "^4.1.0", + "semver": "^7.3.5", + "tar": "^6.2.1", + "which": "^4.0.0" + }, + "bin": { + "node-gyp": "bin/node-gyp.js" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/nopt": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", + "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", + "dependencies": { + "abbrev": "^2.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/package-json-from-dist": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", + "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==" + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/proc-log": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz", + "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/promise-retry": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", + "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", + "dependencies": { + "err-code": "^2.0.2", + "retry": "^0.12.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", + "engines": { + "node": ">= 4" + } + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "optional": true + }, + "node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/smart-buffer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks": { + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", + "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", + "dependencies": { + "ip-address": "^9.0.5", + "smart-buffer": "^4.2.0" + }, + "engines": { + "node": ">= 10.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks-proxy-agent": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz", + "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==", + "dependencies": { + "agent-base": "^7.1.1", + "debug": "^4.3.4", + "socks": "^2.8.3" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==" + }, + "node_modules/ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/string-width-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/tar": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/tar/node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/tar/node_modules/fs-minipass/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/tar/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/unique-filename": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", + "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "dependencies": { + "unique-slug": "^4.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/unique-slug": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", + "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/which": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", + "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "dependencies": { + "isexe": "^3.1.1" + }, + "bin": { + "node-which": "bin/which.js" + }, + "engines": { + "node": "^16.13.0 || >=18.0.0" + } + }, + "node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/wrap-ansi-cjs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + }, + "dependencies": { + "@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "requires": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + } + }, + "@npmcli/agent": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz", + "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==", + "requires": { + "agent-base": "^7.1.0", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.1", + "lru-cache": "^10.0.1", + "socks-proxy-agent": "^8.0.3" + } + }, + "@npmcli/fs": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", + "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", + "requires": { + "semver": "^7.3.5" + } + }, + "@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "optional": true + }, + "abbrev": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", + "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==" + }, + "agent-base": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", + "requires": { + "debug": "^4.3.4" + } + }, + "aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "requires": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + } + }, + "ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==" + }, + "ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==" + }, + "balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "requires": { + "file-uri-to-path": "1.0.0" + } + }, + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "requires": { + "balanced-match": "^1.0.0" + } + }, + "cacache": { + "version": "18.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz", + "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==", + "requires": { + "@npmcli/fs": "^3.1.0", + "fs-minipass": "^3.0.0", + "glob": "^10.2.2", + "lru-cache": "^10.0.1", + "minipass": "^7.0.3", + "minipass-collect": "^2.0.1", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "p-map": "^4.0.0", + "ssri": "^10.0.0", + "tar": "^6.1.11", + "unique-filename": "^3.0.0" + } + }, + "chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" + }, + "clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==" + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "dependencies": { + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "requires": { + "isexe": "^2.0.0" + } + } + } + }, + "debug": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "requires": { + "ms": "2.1.2" + } + }, + "eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" + }, + "emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + }, + "encoding": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "optional": true, + "requires": { + "iconv-lite": "^0.6.2" + } + }, + "env-paths": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz", + "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==" + }, + "err-code": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==" + }, + "exponential-backoff": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", + "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==" + }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==" + }, + "foreground-child": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz", + "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", + "requires": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + } + }, + "fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "requires": { + "minipass": "^7.0.3" + } + }, + "glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "requires": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + } + }, + "graceful-fs": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" + }, + "http-cache-semantics": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" + }, + "http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "requires": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + } + }, + "https-proxy-agent": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", + "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", + "requires": { + "agent-base": "^7.0.2", + "debug": "4" + } + }, + "iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "optional": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + } + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==" + }, + "indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" + }, + "ip-address": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", + "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", + "requires": { + "jsbn": "1.1.0", + "sprintf-js": "^1.1.3" + } + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "is-lambda": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", + "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==" + }, + "isexe": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", + "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==" + }, + "jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "requires": { + "@isaacs/cliui": "^8.0.2", + "@pkgjs/parseargs": "^0.11.0" + } + }, + "jsbn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", + "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==" + }, + "lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" + }, + "make-fetch-happen": { + "version": "13.0.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz", + "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==", + "requires": { + "@npmcli/agent": "^2.0.0", + "cacache": "^18.0.0", + "http-cache-semantics": "^4.1.1", + "is-lambda": "^1.0.1", + "minipass": "^7.0.2", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "proc-log": "^4.2.0", + "promise-retry": "^2.0.1", + "ssri": "^10.0.0" + } + }, + "minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "requires": { + "brace-expansion": "^2.0.1" + } + }, + "minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==" + }, + "minipass-collect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", + "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", + "requires": { + "minipass": "^7.0.3" + } + }, + "minipass-fetch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", + "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", + "requires": { + "encoding": "^0.1.13", + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + } + }, + "minipass-flush": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", + "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "requires": { + "minipass": "^3.0.0" + }, + "dependencies": { + "minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "requires": { + "yallist": "^4.0.0" + } + } + } + }, + "minipass-pipeline": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", + "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", + "requires": { + "minipass": "^3.0.0" + }, + "dependencies": { + "minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "requires": { + "yallist": "^4.0.0" + } + } + } + }, + "minipass-sized": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", + "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", + "requires": { + "minipass": "^3.0.0" + }, + "dependencies": { + "minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "requires": { + "yallist": "^4.0.0" + } + } + } + }, + "minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "requires": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "dependencies": { + "minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "requires": { + "yallist": "^4.0.0" + } + } + } + }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" + }, + "node-addon-api": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz", + "integrity": "sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==" + }, + "node-gyp": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz", + "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==", + "requires": { + "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", + "glob": "^10.3.10", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^13.0.0", + "nopt": "^7.0.0", + "proc-log": "^4.1.0", + "semver": "^7.3.5", + "tar": "^6.2.1", + "which": "^4.0.0" + } + }, + "nopt": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", + "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", + "requires": { + "abbrev": "^2.0.0" + } + }, + "p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "requires": { + "aggregate-error": "^3.0.0" + } + }, + "package-json-from-dist": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", + "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==" + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + }, + "path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "requires": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + } + }, + "proc-log": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz", + "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==" + }, + "promise-retry": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", + "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", + "requires": { + "err-code": "^2.0.2", + "retry": "^0.12.0" + } + }, + "retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "optional": true + }, + "semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==" + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + }, + "signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==" + }, + "smart-buffer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==" + }, + "socks": { + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", + "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", + "requires": { + "ip-address": "^9.0.5", + "smart-buffer": "^4.2.0" + } + }, + "socks-proxy-agent": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz", + "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==", + "requires": { + "agent-base": "^7.1.1", + "debug": "^4.3.4", + "socks": "^2.8.3" + } + }, + "sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==" + }, + "ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "requires": { + "minipass": "^7.0.3" + } + }, + "string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "requires": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + } + }, + "string-width-cjs": { + "version": "npm:string-width@4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "requires": { + "ansi-regex": "^5.0.1" + } + } + } + }, + "strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "requires": { + "ansi-regex": "^6.0.1" + } + }, + "strip-ansi-cjs": { + "version": "npm:strip-ansi@6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "requires": { + "ansi-regex": "^5.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + } + } + }, + "tar": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", + "requires": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "dependencies": { + "fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "requires": { + "minipass": "^3.0.0" + }, + "dependencies": { + "minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "requires": { + "yallist": "^4.0.0" + } + } + } + }, + "minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==" + } + } + }, + "unique-filename": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", + "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "requires": { + "unique-slug": "^4.0.0" + } + }, + "unique-slug": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", + "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "requires": { + "imurmurhash": "^0.1.4" + } + }, + "which": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", + "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "requires": { + "isexe": "^3.1.1" + } + }, + "wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "requires": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + } + }, + "wrap-ansi-cjs": { + "version": "npm:wrap-ansi@7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "requires": { + "ansi-regex": "^5.0.1" + } + } + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } +} diff --git a/developer/src/server/src/win32/trayicon/addon-src/package.json b/developer/src/server/src/win32/trayicon/addon-src/package.json new file mode 100644 index 0000000000..54dcd5578a --- /dev/null +++ b/developer/src/server/src/win32/trayicon/addon-src/package.json @@ -0,0 +1,23 @@ +{ + "name": "windows-trayicon", + "version": "3.0.0", + "description": "Create tray icon for windows", + "main": "index.js", + "os": [ + "win32" + ], + "scripts": { + "install": "node-gyp configure build" + }, + "author": "mce", + "license": "MIT", + "dependencies": { + "node-gyp": "^10.2.0", + "bindings": "^1.5.0", + "node-addon-api": "^3.1.0" + }, + "repository": { + "type": "git", + "url": "https://github.com/mceSystems/node-windows-trayicon" + } +} diff --git a/developer/src/server/src/win32/trayicon/addon-src/stdafx.cpp b/developer/src/server/src/win32/trayicon/addon-src/stdafx.cpp new file mode 100644 index 0000000000..f1d63e0b43 --- /dev/null +++ b/developer/src/server/src/win32/trayicon/addon-src/stdafx.cpp @@ -0,0 +1,8 @@ +// stdafx.cpp : source file that includes just the standard includes +// ConsoleApplication1.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + +// TODO: reference any additional headers you need in STDAFX.H +// and not in this file diff --git a/developer/src/server/src/win32/trayicon/addon-src/stdafx.h b/developer/src/server/src/win32/trayicon/addon-src/stdafx.h new file mode 100644 index 0000000000..b005a839de --- /dev/null +++ b/developer/src/server/src/win32/trayicon/addon-src/stdafx.h @@ -0,0 +1,15 @@ +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#pragma once + +#include "targetver.h" + +#include +#include + + + +// TODO: reference additional headers your program requires here diff --git a/developer/src/server/src/win32/trayicon/addon-src/targetver.h b/developer/src/server/src/win32/trayicon/addon-src/targetver.h new file mode 100644 index 0000000000..87c0086de7 --- /dev/null +++ b/developer/src/server/src/win32/trayicon/addon-src/targetver.h @@ -0,0 +1,8 @@ +#pragma once + +// Including SDKDDKVer.h defines the highest available Windows platform. + +// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and +// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. + +#include diff --git a/developer/src/server/src/win32/trayicon/addon-src/test/index.js b/developer/src/server/src/win32/trayicon/addon-src/test/index.js new file mode 100644 index 0000000000..1f0a032602 --- /dev/null +++ b/developer/src/server/src/win32/trayicon/addon-src/test/index.js @@ -0,0 +1,45 @@ +const WindowsTrayicon = require(".."); +const path = require("path"); +const fs = require("fs"); + +const myTrayApp = new WindowsTrayicon({ + title: "Trayicon Test", + icon: path.resolve(__dirname, "icon.ico"), + menu: [ + { + id: "item-1-id", + caption: "First Item" + }, + { + id: "item-2-id", + caption: "Second Item" + }, + { + id: "item-3-id-exit", + caption: "Exit" + } + ] +}); + +myTrayApp.item((id) => { + console.log(`Menu id selected=${id}`); + switch (id) { + case "item-1-id": { + console.log("First item selected..."); + break; + } + case "item-2-id": { + myTrayApp.balloon("Hello There!", "This is my message to you").then(() => { + console.log("Balloon clicked"); + }) + break; + } + case "item-3-id-exit": { + myTrayApp.exit(); + process.exit(0) + break; + } + } +}); + +process.stdin.resume() \ No newline at end of file diff --git a/developer/src/tike/child/UfrmDebug.pas b/developer/src/tike/child/UfrmDebug.pas index d40993af4c..66116034dc 100644 --- a/developer/src/tike/child/UfrmDebug.pas +++ b/developer/src/tike/child/UfrmDebug.pas @@ -424,14 +424,21 @@ function TfrmDebug.ProcessKeyEvent(var Message: TMessage): Boolean; end; end; var - vkey, modifier: uint16_t; + scan, vkey, modifier: uint16_t; begin Assert(Assigned(FDebugCore)); // We always use the US virtual key code as a basis for our keystroke // mapping; the best way to do this is to extract the scan code from // the message data and work from that - vkey := MapScanCodeToUSVK((Message.LParam and $FF0000) shr 16); + + // Note: if a key event has a zero scan code, it has probably been + // injected, so we will do our best with it, using the VK as provided. + // See also #11978 + scan := (Message.LParam and $FF0000) shr 16; + if scan = 0 + then vkey := Message.WParam + else vkey := MapScanCodeToUSVK(scan); // We don't support the Right Shift modifier in Keyman; // we treat it as Left Shift, even though MapScanCodeToUSVK diff --git a/developer/src/tike/dialogs/UfrmAboutTike.dfm b/developer/src/tike/dialogs/UfrmAboutTike.dfm index 3210c1e0e3..d1146e625b 100644 --- a/developer/src/tike/dialogs/UfrmAboutTike.dfm +++ b/developer/src/tike/dialogs/UfrmAboutTike.dfm @@ -504,12 +504,12 @@ inherited frmAboutTike: TfrmAboutTike 6082} end object lblCopyright: TLabel - Left = 125 - Top = 347 + Left = 156 + Top = 304 Width = 200 Height = 11 Anchors = [akLeft, akBottom] - Caption = 'Copyright SIL International. All Rights Reserved' + Caption = 'Copyright SIL Global. All Rights Reserved' Font.Charset = ANSI_CHARSET Font.Color = clBlack Font.Height = -9 @@ -544,50 +544,98 @@ inherited frmAboutTike: TfrmAboutTike ExplicitWidth = 634 end object Image1: TImage - Left = 55 + Left = 39 Top = 256 - Width = 52 - Height = 58 + Width = 107 + Height = 64 AutoSize = True Picture.Data = { - 0954506E67496D61676589504E470D0A1A0A0000000D49484452000000340000 - 003A08020000007010EDCC000000097048597300000B1100000B11017F645F91 - 0000001674455874536F667477617265007061696E742E6E657420342E314CEF - C5FF000003664944415478DA6364889DC9305801E3A8E3461D37EAB851C78D3A - 6ED471A38E1B75DCA000A38E1B75DCA8E348751C2323839182A8BD86A48A181F - 2323E3C3379F2F3E7A7BEEC19B979FBE232B6366022A6484B0FF31FCFFF7EF3F - 5C8A152C0707BFFF20C951E2384B55F149315646F2A2C8A683ACFFFFBF76ED99 - F6CDE7215C0E56E6CB6DA10AA2BC10EEB26377E267ED872B3E54ED67A52A0EE7 - 8AE72C7EFBE507A58EF337525891E5CCCECA8C55367DFEE1D907AEC31D77B53D - 4C11E6B8A5C76EC7CE4438EE488D3FB2E344B31751EA38097ECEEB9DE1FC9C6C - B81418D5ADBDF0F0EDC038AE23CCACCCDB0059E4EBCFDFB75F7CFAF3EF9FB420 - B700179B40C682DF7FFF0D80E38049F86C53908E8C105CE4D8ED97811377BEFD - F213226BA8207CF2CE2B78BAA6ABE37838586F76854BF273C1451CDB371FBCF1 - 1C974174775C67B8A400C2712E9D5BF75D7B3A281C072C980ED7F85928234CDC - 7BEDA9FF849DDF7EFE1978C7014182ADDABC14076491D3F75F27CC3A70FDD9FB - 81771C30D5EFAFF44536140880213761D7E5E60DE77EFEF93B908E030259219E - DDE5DE6A12FC68E2C0200C99B4EBF1BBAF03E9382010E1E5589CEEE8AA23C384 - 5A7FDD7CFEC1AA69E3FB6F3F07D2710CE0CC116DA53A39D69A978315597CC1E1 - 5BC9730EFC1F58C7410030723716B8AB4B0AC045BEFCF8AD5CB2FCF5E71F03EF - 38205095E0BFDC1ACAC6C20417899CB677E5C9BB83C271C0F83DD51064282F0C - 17A9597BBA6DD3F941E1381626C68BADA19A5288982D5E7EA27FC7255A398E2D - 710E234E4906B814331313B00595EEA459E2A98FACC4AE75D3915B2F48759C6C - C1D2775F7FFEFF8FAF390C94637CFFE527FE9085D340EBD958505A9D0FDF7ED1 - AA58F5FDD71F521DF7F9FBEF7F0C841BEA8CFF886ACD6307590B8FCCD8770DC2 - 26C9714402321DF7F7DFFF093B2F97AD38415E7B8E568E0356A9579FBC6F587F - 66EBC547C86986268E2B5A761C1EFBFF71A4038823FEFCFDF7E4FDD7F30FDF3C - 7DF715B36BC7C2CC54EAA527C4CD0EE19E7BF076F9893B70D96C176D05111E92 - 1D37E43BD5A38E1B75DCA8E306011875DC30701CB0FF1466AE2C2BC4FDF0CD97 - 35A7EEFD1F548E9311E276D39171D395D97BF5E9B2E377BEFEFC33881CC7C3C1 - 5AE8AEFBE0CD676531BEB6CDE77FFDF937881C0704DCECAC5A5202D79E7DF8FA - F33703385A670DB4937002000B26443581ED65730000000049454E44AE426082} + 0954506E67496D61676589504E470D0A1A0A0000000D494844520000006B0000 + 004008060000001DD489F9000000017352474200AECE1CE90000000467414D41 + 0000B18F0BFC6105000000097048597300002E2200002E2201AAE2DD92000009 + 584944415478DAED9C7D6C55E51DC77FF7BDEFF6B65494F262CB4A41A0142302 + CA26533A20CE85B0CD04D1A0C365739B714BD438CDD8CCD8B24463BA65CB92C5 + B89704131707D9FE603AC44DDBA1825005456094BE496BDFDBDBDEB6F7F5ECF9 + 5E7AEF3DE7DCE79C7BCE6DE1DE933EDFA494F39C7BCE7D389FE7F77B7EBFDFF3 + 1C6C246419D9B2DD0121E312B02C2401CB4212B02C2401CB42D2845572A0CDCB + 7EDD96ED0EF254E6B1D38A52774ADF4702D1F677EFA93C173FAE79F86F2BA212 + 2DC9767FCDC861B39DB8F0C79D83BC737AB0EE60BF9AB3DD799E567BDD749DDB + AE689B8C48746628D838B0EBA61FC5DBAAF7BCD62849F478B6FB6B4676BBADA1 + F54F5F7F9377CE72B02A0B9C5455EC54B431EBA1D343411A0F471B7DBBAB04AC + 5C509EC346B7947BC8AEEA75DB58982E4F84F157012B57B4B2D44D5E8FD2FDF9 + 4251B83F92AE1C0A58B920041537335872C1FDB50C0568322CC59B04AC6C0B9D + 5CCBDC5F8153D9DD2E7F983AC6C3F226012BDB9A9FEFA09A1297A22DC0A2BF93 + 83819875C924606553E8E02DF33C94EF5076F5C26888FAA622EA8F0B58D9D4BC + 3C072DBF4E6955136C8E6A615625A57E5CC0E20903BDDCE3A012969C62D4E338 + C49EDE68304A3D2C8C8E48342BAA2B7353894B19019E6756D59F6A559080A5B8 + 19BB6251A19316B0E4D4A17135E6934F4682310B9889105020AF52DFFB8301AE + 554102565C456C84D7329794EF485FFFC54385AB9A092F542A50B190AB9D457F + 9FF9C35A97085810E68E652C22B39BA8D3E3A1B68F878D5FA0D23A1658786403 + 03DC4FF4072818D51C0102D6F50C540DB328AD0F4B1A370AB1877ABC5FD365E9 + AA9859F19A3265123C1C88C6DCAB8EE636AC521640ACF4BAB91F1C61C10492D2 + B1503466012807A913D78F8682B1F366B5A4C8199B1BE5FA9F2F44BD9311BDCB + E62EAC3C87ADB99E8D6E27C7F7753217D7A9727115CC026B5561F645F6803FD7 + 7FC05CE17B8B5451E0FBCC4A43515D3B9D9BB0BCAFB4DDC12CAA591D3643B0A6 + 2ECE24CF735D3CA8E904E35C7F7D9EA273FE7094052CC17497CE4D585B8FF46C + 629EAD49DD8EAA01AA073C016C9D0A5626418677DAF5CAD53D11A14B63A17497 + 660CCB6EB3D19A6A2FDDBCA4940AF39C34E80BD0B9AED1D84F243A4B49A3917E + 64026BFB9B3D9BD849052CACC67EC8C271AD8417F3DB2AD543E6145BD30A7315 + E62CB9741261B932827567DD7CDAB7BB9EAA6E284A3937EA0FD237F6FF875ABB + C7126DAF3E73272D5D509C38BEFD878729184ECECBEFFDFA1ECA733B12C7F7EE + 3B4A5DFD7E43FFF6598375663818AB506889571AD272997AC23D702FB94EB141 + 6220C9360DEB6B1B17D18BDF5917B32C9ED8F554FFE83F686C3269D5FFFC4503 + D52E2C49F677EF2105AC4F5FDA411E57B2FF5F7EEA0DEAE81D37F46F9F15587A + EE2F2E5435AA554BEEADCC75F54C980B30B01C52E854E657C77AA78CA400A660 + 95157BE8ED17B6C5DC9E963AFBFCB4F9C9D7156D390D0B2E1BCB11813405BFEA + 621703A6B488730CF0407AF7A5D046165CC88B2470BF270702462E3505EBA186 + 2FD0BE07D628DACEB40DD36B4D1DE46396B4F4C6622AF03868FF2BA7159FC969 + 58062777EEB2BBD93C0B69C2860A653D10AE172ED8804CC17AE1DBB7D2CE4DC9 + 9D6A7D2353B4F989D7692AA43FB87216166C0985D3745605DD3ACF13DBD422D7 + 71FDF2508A78C55B0416E747D30F163209EB773FD840DBD755268E4F5F1AA61D + CFBD95F64B721696D10785BC79A32A3702A3637D53863A19172FFCC79CD76AC0 + B2C924AC27BFB98A1EFD6A6DE2381C89D28E9FFD9BCE768EE87E49CEC2C27E3C + 9F0137C6B308446F88E2CC88976399C8D54CC15AC61EF8E1FD5B1491A06F2244 + 3FFD4B0BFDFDDD2ECD2FC949585311A9C9E0C4CE0DDB8702513A3B6268AE49A8 + FCCAD668451B2A209DC6C27FD3A1FBB3F7D7D1DEAD3529EDCD1FF7D2D32F9FA2 + EEC18994733909AB6B3CDC64F021D16296C82E5625B2D878890D986684D5E715 + A519E76AA6613998FF7E9E051A3B6E5F9C726E682C407B9E6FA64F3A946E3127 + 61B50C069A8CAEF6A2805BA14A643329E25E6B58F187F0C0DD4BE9A9FB56A5E4 + 5C8810B73F7B8486C7931E22E7602D3FD4B98985EC4D6450BC2AF9C72CDC1E09 + 9A5B1EE16DE63451B29A512177514521FDF6FBEB69759557D1FE87C317E857AF + 9E491CE71C2CB3BB9BD4892C84907FCAE4CE19BC1DB25A15609870A733AEBA17 + E5BB188C2D54595E9068FBACDF4F5F7A2259C5B0342C17F3FBEB5589AC891291 + F26139ED545FAE8405570A976A40B3B244F2CCAE3A7A645B32E8407D70D9B70E + 26AAEF9686853ADE5A55D81E9C5ED2372A9402115162CE525741609C58CF4225 + 0335CAC9F0D5DD83F1F33D6B69F75DD589E310FBEEE58F1C8A41832C0D8BE7BA + 0C2E16C6AC7261A1836EC8D7DEDAA61612F54BCC2D72568D15B0B6FEF85F8DEC + 135C58BCAF2A2A70D11757CDA7EFDD5B4B2E4772C09C6E1B66C972B2B26116D6 + DE17FF9B920248893F946D2CE56B78E3975FB97AB0784101126924D45A42C563 + 6181932A0B8D43920B967B76388417E8E4CD0A5892243512CD7CA5F8277F6EA1 + 036F5D4A1C9B8565525B6C36DB51DE895981C50BB7F560012E2AF47999509209 + 968542B12C88997558C7CEF6C5722DF96AB1A561618E59A9B22CDE9C85CDA155 + 0C5299C7AE7B3F148D3D2A9028398109AE2D96A508AAED69B3060B70FEFA4E3B + ED3FF0114D0695B9A2A561F1EA82D0C5E9AD63F9EC3C1626F1EA8E9E2D217800 + 1424E2D8782387D2C7EE73613A2254BF577C22B92AA08075B0B9C3102C494A5A + CD4480459EDD3E3AFA610F5D1E98E07EFEB907EBA9725E32B4FFEE6FDE8B1581 + E3FAFD631BC8E5D41F903A6AB87BED82AB3767E1261B3879965161DE69F58515 + EB5EBCEABBBC228254C135BD454E967CCFCDDD4D669362BCEC06CB31230C68D4 + 1E614DBC60FCA622278B1495E59F4136F23147C152E39D97AD0C085846A4F526 + BD96FCCCD5614F873FAC5D8EC2AD96716A8E7261DE7FBF7F2ABEE34AC0322A24 + B5B5CCC26C3AC010C1A1D6870545A3D50D6C4D43559F775FD5265201CB8C50CD + C05289D7ED485819463FDC149259FC64B26712967B63FE9597F7B04F03D01174 + A8AAFA025626C28DE37BE443D76E47AB80652109581692806521590ED6AECD55 + 545AE4A6931707E9F8B901012BDB9DD292D361A7BDDB6A28128952479F9F8E9C + EA16B0B2DD293D6D5C51117BE3A4EDF3716AEF1D17B0B2DD2933CA1416CACAF5 + D9EEBC495D66B05AE307350F1FAC952469F14C6E78ADE5B0DB4E9E7F79E710EF + 9CF80F8D2D2401CB4212B02C2401CB4212B02C2401CB42FA3FF896A69B0C9D8C + 0A0000000049454E44AE426082} end object Label1: TLabel - Left = 125 + Left = 156 Top = 284 Width = 184 Height = 18 - Caption = 'Created by SIL International' + Caption = 'Created by SIL Global' Color = clWhite Font.Charset = ANSI_CHARSET Font.Color = clBlack diff --git a/developer/src/tike/xml/project/globalwelcome.xsl b/developer/src/tike/xml/project/globalwelcome.xsl index aecd70d90f..5ef8c4a7e1 100644 --- a/developer/src/tike/xml/project/globalwelcome.xsl +++ b/developer/src/tike/xml/project/globalwelcome.xsl @@ -18,8 +18,8 @@

Version

-
Created by SIL International - +
Created by SIL Global +
diff --git a/developer/src/tike/xml/project/project.css b/developer/src/tike/xml/project/project.css index c9486e4ac6..cd29ef360f 100644 --- a/developer/src/tike/xml/project/project.css +++ b/developer/src/tike/xml/project/project.css @@ -281,7 +281,8 @@ k\:menuitem.down { #header-sil img { vertical-align: top; - margin-left: 4px; + margin-left: -6px; + margin-top: 7px; } #header-sil > div { diff --git a/developer/src/tike/xml/project/sil.png b/developer/src/tike/xml/project/sil.png index 08a4291d5e..b65c2a4e08 100644 Binary files a/developer/src/tike/xml/project/sil.png and b/developer/src/tike/xml/project/sil.png differ diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS index 7902ce7a68..75530e6bde 100644 --- a/docs/CODEOWNERS +++ b/docs/CODEOWNERS @@ -3,30 +3,30 @@ # # @darcywong00 @mcdurdin @ermshiperete @rc-swag @SabineSIL @sgschantz -/android/ @darcywong00 @sgschantz +/android/ @darcywong00 @sgschantz -/common/ @mcdurdin @rc-swag -/core/ @mcdurdin @rc-swag -/common/lexical-model-types/ @jahorton @mcdurdin -/common/models/ @jahorton @mcdurdin -/common/predictive-text/ @jahorton @mcdurdin -/common/schemas/ @mcdurdin @jahorton -/common/test/ @mcdurdin @ermshiperete -/common/web/ @jahorton @mcdurdin +/common/ @mcdurdin @rc-swag +/core/ @mcdurdin @rc-swag +/common/lexical-model-types/ @jahorton @mcdurdin +/common/models/ @jahorton @mcdurdin +/common/schemas/ @mcdurdin @jahorton +/common/test/ @mcdurdin @ermshiperete +/common/web/ @jahorton @mcdurdin -/developer/ @mcdurdin @darcywong00 -/docs/ @mcdurdin @jahorton -/ios/ @sgschantz @jahorton -/linux/ @ermshiperete @darcywong00 -/mac/ @sgschantz @SabineSIL +/developer/ @mcdurdin @darcywong00 +/docs/ @mcdurdin @jahorton +/ios/ @sgschantz @jahorton +/linux/ @ermshiperete @darcywong00 +/mac/ @sgschantz @SabineSIL -/oem/firstvoices/android/ @darcywong00 @sgschantz -/oem/firstvoices/common/ @mcdurdin @rc-swag -/oem/firstvoices/ios/ @sgschantz @jahorton -/oem/firstvoices/windows/ @rc-swag @ermshiperete -/resources/ @mcdurdin @jahorton +/oem/firstvoices/android/ @darcywong00 @sgschantz +/oem/firstvoices/common/ @mcdurdin @rc-swag +/oem/firstvoices/ios/ @sgschantz @jahorton +/oem/firstvoices/windows/ @rc-swag @ermshiperete +/resources/ @mcdurdin @jahorton # Web is currently shared between Eberhard and Joshua: -/web/ @ermshiperete @jahorton +/web/ @ermshiperete @jahorton +/web/src/engine/predictive-text/ @jahorton @mcdurdin -/windows/ @rc-swag @ermshiperete +/windows/ @rc-swag @ermshiperete diff --git a/docs/file-formats/kmx-file-format.md b/docs/file-formats/kmx-file-format.md new file mode 100644 index 0000000000..67288bc123 --- /dev/null +++ b/docs/file-formats/kmx-file-format.md @@ -0,0 +1,361 @@ +# KMX Binary Format + +This document describes the binary format for KMX, compiled from Keyman .kmn +source files. + +## Principles + +- All integer values are unsigned 32-bit little-endian unless otherwise + specified. +- All offsets are 32-bit little-endian values. All offsets are relative to the + beginning of the data (normally start of file). A zero offset indicates that + the value is not present, equivalent to `NULL` -- no offset can ever point to + the start of the file. +- All strings are UTF-16LE unless otherwise specified and null terminated. + Strings are referenced by offset (see above). +- The file format has a header section followed by data. There is no specific + defined order for data in the file. Empty space is permitted but should be + zeroed. Note that `COMP_KEYBOARD_KMXPLUS` must follow immediately after + `COMP_KEYBOARD` with no empty space (that is at byte offset 64). + +A .kmx file is essentially a 32-bit memory mapped file. In a 32-bit process, the +file can be loaded into a memory buffer, and (assuming the file is valid), all +offset values in the file can be rewritten into pointers by adding the base of +the memory buffer to them. (In a 64-bit process, a fixup is needed to make space +for 64-bit pointers.) + +## `COMP_KEYBOARD`: KMX header + +The very first section is a header that describes the remainder of the file. + +| ∆ | Bits | Name | Description | +|---|------|----------------------|-----------------------------------------------------------------------------------| +| 0 | 32 | `dwIdentifier` | `KXTS` 0x5354584B, `kmx.FILEID_COMPILED` | +| 4 | 32 | `dwFileVersion` | minimum Keyman version that can read the file, `KMX_Version` enum | +| 8 | 32 | `dwCheckSum` | deprecated in 16.0, `0x0`; CRC32 checksum of entire file | +|12 | 32 | `KeyboardID` | deprecated in 10.0, `0x0`; Windows LANGID for keyboard | +|16 | 32 | `IsRegistered` | deprecated in 10.0, `0x1`; registration status of compiler | +|20 | 32 | `version` | deprecated, `0x0`; was version of keyboard, see `TSS_KEYBOARDVERSION` | +|24 | 32 | `cxStoreArray` | number of `COMP_STORE` entries in `COMP_KEYBOARD.dpStoreArray` | +|28 | 32 | `cxGroupArray` | number of `COMP_GROUP` entries in `COMP_KEYBOARD.dpGroupArray` | +|32 | 32 | `dpStoreArray` | offset of first `COMP_STORE` entry | +|36 | 32 | `dpGroupArray` | offset of first `COMP_GROUP` entry | +|40 | 32 | `StartGroup_ANSI` | deprecated; index of starting non-Unicode `COMP_GROUP`, `0xFFFFFFFF` means unused | +|44 | 32 | `StartGroup_Unicode` | index of starting Unicode `COMP_GROUP`, `0xFFFFFFFF` means unused | +|48 | 32 | `dwFlags` | global flags for the keyboard, see description below | +|52 | 32 | `dwHotKey` | default hotkey for keyboard, from [`&Hotkey`], see description below | +|56 | 32 | `dpBitmapOffset` | offset of keyboard icon | +|60 | 32 | `dwBitmapSize` | size in bytes of keyboard icon, `0x0` if not present | + +This structure is present at the start of every .kmx file. The `KXTS` identifier +can be used as a 'magic' to determine whether a binary file is a .kmx file. + +Note that `dpBitmapOffset` should be ignored if `dwBitmapSize` is `0x0` -- it may be a non-zero value. + +### `dwFileVersion`: Minimum version of Keyman required to read the file + +The `dwFileVersion` property should be checked before attempting to read any +other data in the file. If it is not a recognized version, then no further +attempt should be made to read the file. The recognized versions are listed in +the `KMX_Version` enum: + +| Value | Identifier | Description | +|--------------|---------------|------------------------------------------------------------------| +| `0x00000300` | `VERSION_30` | Keyman 3.0. Non-Unicode, Windows 3.1 only, not supported | +| `0x00000301` | `VERSION_31` | Keyman 3.1. Non-Unicode, Windows 3.1 only, not supported | +| `0x00000302` | `VERSION_32` | Keyman 3.2. Non-Unicode, Windows 3.1, 95, 98 only, not supported | +| `0x00000400` | `VERSION_40` | Keyman 4.0. Non-Unicode, Windows 3.1, 95, 98 only, not supported | +| `0x00000500` | `VERSION_50` | Keyman 5.0. Unicode, Windows only | +| `0x00000501` | `VERSION_501` | Keyman 5.1, added support for `call()` statement | +| `0x00000600` | `VERSION_60` | Keyman 6.0 | +| `0x00000700` | `VERSION_70` | Keyman 7.0 | +| `0x00000800` | `VERSION_80` | Keyman 8.0 | +| `0x00000900` | `VERSION_90` | Keyman 9.0 | +| `0x00000A00` | `VERSION_100` | Keyman 10.0, first true multi-platform version | +| `0x00000E00` | `VERSION_140` | Keyman 14.0 (versions 11.0-13.0 had no binary format changes) | +| `0x00000F00` | `VERSION_150` | Keyman 15.0 | +| `0x00001000` | `VERSION_160` | Keyman 16.0 | +| `0x00001100` | `VERSION_170` | Keyman 17.0 | + +### `StartGroup` + +Keyboards may have up to 4 starting groups, defined by [`begin`] statements in +the source .kmn file.. The `begin ANSI` group and `begin Unicode` groups are +defined in the `COMP_KEYBOARD` header, however as they were introduced into the +format later, the `begin NewContext` and `begin PostKeystroke` groups are +defined as system stores. + +### `dwFlags` + +The following flags are defined for .kmx keyboards: + +| Bit value | Name | Description | +|--------------|-----------------------|---------------------------------------------------------------------------------------------| +| `0x00000001` | `KF_SHIFTFREESCAPS` | Pressing Shift releases Caps Lock (see [`&ShiftFreesCaps`]) | +| `0x00000002` | `KF_CAPSONONLY` | Caps Lock switches on only (see [`&CapsOnOnly`]) | +| `0x00000004` | `KF_CAPSALWAYSOFF` | Caps Lock state is disabled (see [`&CapsAlwaysOff`]) | +| `0x00000008` | `KF_LOGICALLAYOUT` | Unused, should never be set | +| `0x00000010` | `KF_AUTOMATICVERSION` | The compiler determined the minimum version of Keyman automatically (see [`&Version`]) | +| `0x00000020` | `KF_KMXPLUS` | 16.0+: A `COMP_KEYBOARD_KMXPLUSINFO` structure is present immediately after `COMP_KEYBOARD` | + +### `dwHotKey`: keyboard hotkeys + +This field is `0x0` if no default hotkey is specified. The value is a bitmask: + +| Bit mask | Name | Description | +|--------------|-------------|------------------------------------------| +| `0x000000FF` | virtual key | [Keyman virtual key] value of the hotkey | +| `0x00010000` | `HK_ALT` | Set if the hotkey uses Alt | +| `0x00020000` | `HK_CTRL` | Set if the hotkey uses Ctrl | +| `0x00040000` | `HK_SHIFT` | Set if the hotkey uses Shift | + +### Keyboard icon + +The `COMP_KEYBOARD.dpBitmapOffset` and `COMP_KEYBOARD.dwBitmapSize` members +describe the keyboard icon, if present. If not present, both members should have +the value `0x0`. The keyboard icon may be a 16x16 Windows .bmp format file, 4, +8, 24, or 32 bit color, or a Windows .ico format file, which may have multiple +icons present at different bit depths and resolutions. Refer to the Windows API +documentation for .bmp and .ico binary formats. + +By convention, the compiler stores the bitmap image at the end of the KMX +data, but this is not a requirement of the file format. + +## `COMP_KEYBOARD_KMXPLUSINFO`: KMX+ secondary header + +| ∆ | Bits | Name | Description | +|---|------|-----------------|----------------------------| +| 0 | 32 | `dpKMXPlus` | offset of KMX+ data | +| 4 | 32 | `dwKMXPlusSize` | size in bytes of KMX+ data | + +The `COMP_KEYBOARD_KMXPLUSINFO` structure is present only if +`COMP_KEYBOARD.dwFlags` flag has bit `KF_KMXPLUS` (`0x20`) set. If present, it +must be located immediately after the `COMP_KEYBOARD` structure, that is, at +byte offset 64. + +See [KMX+ File Format] for details of the KMX+ file format. + +## `COMP_STORE` + +| ∆ | Bits | Name | Description | +|---|------|--------------|------------------------------------------------------------------------| +| 0 | 32 | `dwSystemID` | `0x0` for a normal store, or a system store value | +| 4 | 32 | `dpName` | offset to name of the store from keyboard source, `0x0` if not present | +| 8 | 32 | `dpString` | offset to value of the store | + +The `COMP_STORE` structure describes a [`store`] in the keyboard source file. +`COMP_STORE` structures are also used for additional metadata such as compiler +version. + +Store names are compiled into keyboards if debug information is included (see +[Debug information for keyboards](#debug-information-for-keyboards)), or if the store is used for [keyboard +options]. If the store name is not included, `dpName` will have a `0x0` value. + +### System Stores + +If `dwSystemID` is non-zero, then it will be one of the following values: + +| Value | Identifier | Count | Version | Description | +|-------|---------------------------------|-------|---------|------------------------------------------------------------------------------------------| +| 0 | `TSS_NONE` | 0+ | 5.0 | (Not a system store, normal keyboard store data) | +| 1 | `TSS_BITMAP` | 0-1 | 5.0 | [`&Bitmap`] store, used during compile only; see `COMP_KEYBOARD.dpBitmapOffset` | +| 2 | `TSS_COPYRIGHT` | 0-1 | 5.0 | [`&Copyright`] store | +| 3 | `TSS_HOTKEY` | 0-1 | 5.0 | [`&Hotkey`] store (see also `COMP_KEYBOARD.dwHotkey`) | +| 4 | `TSS_LANGUAGE` | 0-1 | 5.0 | Deprecated, [`&Language`] store | +| 5 | `TSS_LAYOUT` | 0-1 | 5.0 | Deprecated, [`LAYOUT`] statement | +| 6 | `TSS_MESSAGE` | 0-1 | 5.0 | [`&Message`] store | +| 7 | `TSS_NAME` | 0-1 | 5.0 | [`&Name`] store, public name of keyboard | +| 8 | `TSS_VERSION` | 0-1 | 5.0 | [`&Version`] store; use `COMP_KEYBOARD.dwFileVersion` | +| 9 | `TSS_CAPSONONLY` | 0-1 | 5.0 | [`&CapsOnOnly`] store; use `TF_CAPSONONLY` | +| 10 | `TSS_CAPSALWAYSOFF` | 0-1 | 5.0 | [`&CapsAlwaysOff`] store; use `TF_CAPSALWAYSOFF` | +| 11 | `TSS_SHIFTFREESCAPS` | 0-1 | 5.0 | [`&ShiftFreesCaps`] store; use `TF_SHIFTFREESCAPS` | +| 12 | `TSS_LANGUAGENAME` | 0-1 | 5.0 | Deprecated, `LANGUAGENAME` statement | +| 13 | `TSS_CALLDEFINITION` | 0+ | 5.0 | Definition for an IMX call | +| 14 | `TSS_CALLDEFINITION_LOADFAILED` | 0 | 5.0 | Deprecated, unused, was used internally in KMX processor | +| 15 | `TSS_ETHNOLOGUECODE` | 0-1 | 5.0 | Deprecated, [`&EthnologueCode`] store | +| 16 | `TSS_DEBUG_LINE` | 0+ | 5.0 | [Debug information for keyboards](#debug-information-for-keyboards) | +| 17 | `TSS_MNEMONIC` | 0-1 | 5.0 | [`&MnemonicLayout`] store, `'0'` or `'1'` | +| 18 | `TSS_INCLUDECODES` | 0-1 | 5.0 | [`&IncludeCodes`] store, used during compile only | +| 19 | `TSS_OLDCHARPOSMATCHING` | 0-1 | 5.0 | Deprecated, [`&OldCharPosMatching`] store | +| 20 | `TSS_COMPILEDVERSION` | 0-1 | 5.0 | Version of compiler used, may be omitted if `--no-compiler-version` passed to kmc | +| 21 | `TSS_KEYMANCOPYRIGHT` | 0-1 | 5.0 | Copyright message from compiler, may be omitted if `--no-compiler-version` passed to kmc | +| 22 | `TSS_CUSTOMKEYMANEDITION` | 1 | 5.0 | Deprecated, always `'0'`, always present | +| 23 | `TSS_CUSTOMKEYMANEDITIONNAME` | 1 | 5.0 | Deprecated, always `'Keyman'`, always present | +| 24 | `TSS_VISUALKEYBOARD` | 0-1 | 7.0 | [`&VisualKeyboard`] store | +| 25 | `TSS_KMW_RTL` | 0-1 | 7.0 | [`&KMW_RTL`] store, `'0'` or `'1'` | +| 26 | `TSS_KMW_HELPFILE` | 0-1 | 7.0 | [`&KMW_HelpFile`] store, used during compile only | +| 27 | `TSS_KMW_HELPTEXT` | 0-1 | 7.0 | [`&KMW_HelpText`] store, used during compile only | +| 28 | `TSS_KMW_EMBEDJS` | 0-1 | 7.0 | [`&KMW_EmbedJS`] store, used during compile only | +| 29 | `TSS_WINDOWSLANGUAGES` | 0-1 | 7.0 | Deprecated, [`&WindowsLanguages`] store | +| 30 | `TSS_COMPARISON` | 0+ | 8.0 | Generated by compiler for use in `if()` statements | +| 31 | `TSS_PLATFORM` | 0-1 | 9.0 | Cannot be used in `COMP_STORE`; used for [`if(&platform)`]. [`platform()`] only | +| 32 | `TSS_BASELAYOUT` | 0-1 | 9.0 | Cannot be used in `COMP_STORE`; used for [`if(&baselayout)`], [`baselayout()`] only | +| 33 | `TSS_LAYER` | 0 | 9.0 | Cannot be used in `COMP_STORE`; used for [`if(&layer)`] and [`set(&layer)`] | +| 34 | `TSS_VKDICTIONARY` | 0-1 | 9.0 | Dictionary of `T_` and `U_` virtual key names for touch layouts, generated by compiler | +| 35 | `TSS_LAYOUTFILE` | 0-1 | 9.0 | Name of touch layout file, used during compile only | +| 36 | `TSS_KEYBOARDVERSION` | 0-1 | 9.0 | [`&KeyboardVersion`] store | +| 37 | `TSS_KMW_EMBEDCSS` | 0-1 | 9.0 | [`&KMW_EmbedCSS`] store, used during compile only | +| 38 | `TSS_TARGETS` | 0-1 | 9.0 | [`&Targets`] store | +| 39 | `TSS_CASEDKEYS` | 0-1 | 14.0 | [`&CasedKeys`] store, used during compile only | +| 40 | `TSS_BEGIN_NEWCONTEXT` | 0-1 | 15.0 | zero-based index of group referenced in [`begin NewContext`] | +| 41 | `TSS_BEGIN_POSTKEYSTROKE` | 0-1 | 15.0 | zero-based index of group referenced in [`begin PostKeystroke`] | +| 42 | `TSS_NEWLAYER` | 0 | 15.0 | Cannot be used in `COMP_STORE`; used for testing layer switch events | +| 43 | `TSS_OLDLAYER` | 0 | 15.0 | Cannot be used in `COMP_STORE`; used for testing layer switch events | +| 44 | `TSS_DISPLAYMAP` | 0-1 | 17.0 | [`&DisplayMap`] store | + +## `COMP_GROUP` + +| ∆ | Bits | Name | Description | +|----|------|--------------|-----------------------------------------------------------------------------| +| 0 | 32 | `dpName` | offset to name of the group from keyboard source, `0x0` if not present | +| 4 | 32 | `dpKeyArray` | offset to array of `COMP_KEY` entries | +| 8 | 32 | `dpMatch` | offset to string for the [`match`] statement output, `0x0` if not present | +| 12 | 32 | `dpNoMatch` | offset to string for the [`nomatch`] statement output, `0x0` if not present | +| 16 | 32 | `cxKeyArray` | number of `COMP_KEY` entries in `COMP_GROUP.dpKeyArray` | +| 20 | 32 | `fUsingKeys` | `0x1` if group is `using keys`, `0x0` otherwise | + +The `COMP_GROUP` structure describes a [`group`] in the keyboard source file. +Note that the `readonly` property of a group is only applicable in the source +file and is never written to the binary format. + +## `COMP_KEY` + +| ∆ | Bits | Name | Description | +|----|------|--------------|------------------------------------------------------------------------------------------------| +| 0 | 16 | `Key` | [Keyman virtual key], virtual character key, or character, for the rule, 0 if unused | +| 2 | 16 | (unused) | padding, reserved | +| 4 | 32 | `Line` | Line number for the rule, 0 if not compiled with debug information | +| 8 | 32 | `ShiftFlags` | Modifier flags for the key, see description below | +| 12 | 32 | `dpOutput` | offset to string for the output of the rule, always present even for zero-length output | +| 16 | 32 | `dpContext` | offset to string for the context part of the rule, always present even for zero-length context | + +The `COMP_KEY` structure describes a single rule in a keyboard source file. The +compiler expands `any()` statements found in the key part of a rule into +multiple rules -- so the key part of the rule is always only ever matching a +single key combination. + +`ShiftFlags` contains a set of modifier and state key flags, and some additional +flags that determine how to interpret `Key`. + +### Modifier and state key flags + +The modifier and state key flags are: + +| Bit mask | Name | Description | +|--------------|------------------|-----------------------------------------------------------| +| `0x00000001` | `LCTRLFLAG` | Left Control key | +| `0x00000002` | `RCTRLFLAG` | Right Control key | +| `0x00000004` | `LALTFLAG` | Left Alt key (Option on macOS) | +| `0x00000008` | `RALTFLAG` | Right Alt key | +| `0x00000010` | `K_SHIFTFLAG` | Either Shift key | +| `0x00000020` | `K_CTRLFLAG` | Either Ctrl key | +| `0x00000040` | `K_ALTFLAG` | Either Alt key | +| `0x00000080` | `K_METAFLAG` | Either Meta key. Reserved, not for use in .kmx | +| `0x00000100` | `CAPITALFLAG` | Caps lock on | +| `0x00000200` | `NOTCAPITALFLAG` | Caps lock NOT on | +| `0x00000400` | `NUMLOCKFLAG` | Num lock on | +| `0x00000800` | `NOTNUMLOCKFLAG` | Num lock NOT on | +| `0x00001000` | `SCROLLFLAG` | Scroll lock on | +| `0x00002000` | `NOTSCROLLFLAG` | Scroll lock NOT on | + +* The chiral (left/right) modifier flags should not be used together with the + non-chiral flags. +* If neither `CAPITALFLAG` nor `NOTCAPITALFLAG` are set, then the state of the + Caps Lock key is ignored, and the same principle applies for Num lock and + Scroll lock. +* The Meta key may be the Windows key on Windows, or the + Command key on macOS. This flag is reserved for internal use, and + is not valid in a .kmx file. + +### Additional flags + +The meaning of `Key` is determined by the flags `ISVIRTUALKEY` and +`VIRTUALCHARKEY` in `ShiftFlags` (mask `0x0000C000`): + +* `0`: `Key` is a character on a key cap (US English unless the keyboard is a + mnemonic layout). All other shift flags are ignord +* `ISVIRTUALKEY`: `Key` is a US English virtual key +* `VIRTUALCHARKEY`: `Key` is a character on a key cap, combined with the shift + flags (US English unless the keyboard is a mnemonic layout) + +| Bit mask | Name | Description | +|--------------|------------------|-----------------------------------------------| +| `0x00004000` | `ISVIRTUALKEY` | `Key` is a virtual key | +| `0x00008000` | `VIRTUALCHARKEY` | Keyman 6.0+: `Key` is a Virtual character key | + +Note that the shift flags for key rules do not use the same values as hotkeys +for historical reasons. + +## Debug information for keyboards + +When debug information is present, it will be found in four places in compiled +keyboards: + +* `COMP_STORE.dpName`: the name of the store from the .kmn file +* `COMP_GROUP.dpName`: the name of the group from the .kmn file +* `COMP_KEY.Line`: the line number for the rule +* System stores with `COMP_STORE.dwSystemID` value of `TSS_DEBUG_LINE` + +When a keyboard is compiled with debug data, the `TSS_DEBUG_LINE` system store +contains debug information about each source line in the file. In each entry, +`COMP_STORE.dpName` contains debug metadata, and `COMP_STORE.dpString` contains +only the stringified .kmn source line number where the metadata is found. + +The name of the `TSS_DEBUG_LINE` system store starts with a single character +which describes the rest of the debug metadata in that store: + +| Character | Debug data type | Metadata | +|-----------|-----------------------|----------------------------------------------------------| +| `'B'` | [`begin`] statement | `Unicode` or `ANSI` | +| `'M'` | [`match`] statement | Stringified index of containing group, space, group name | +| `'N'` | [`nomatch`] statement | Stringified index of containing group, space, group name | +| `'G'` | [`group`] statement | Stringified index of group, space, group name | +| `'D'` | [`deadkey`] statement | Stringified index of deadkey, space, deadkey name | + + + + + +[KMX+ File Format]: kmx-plus-file-format.md +[`begin`]: https://help.keyman.com/developer/language/reference/begin +[`deadkey`]: https://help.keyman.com/developer/language/reference/deadkey +[`group`]: https://help.keyman.com/developer/language/reference/group +[`match`]: https://help.keyman.com/developer/language/reference/match +[`nomatch`]: https://help.keyman.com/developer/language/reference/nomatch +[`store`]: https://help.keyman.com/developer/language/reference/store +[Keyman virtual key]: https://help.keyman.com/developer/language/guide/virtual-keys +[keyboard options]: https://help.keyman.com/developer/language/guide/variable-stores +[`&Bitmap`]: https://help.keyman.com/developer/language/reference/bitmap +[`&Copyright`]: https://help.keyman.com/developer/language/reference/copyright +[`&Hotkey`]: https://help.keyman.com/developer/language/reference/hotkey +[`&Language`]: https://help.keyman.com/developer/language/reference/language +[`LAYOUT`]: https://help.keyman.com/developer/language/reference/layout +[`&Message`]: https://help.keyman.com/developer/language/reference/message +[`&Name`]: https://help.keyman.com/developer/language/reference/name +[`&Version`]: https://help.keyman.com/developer/language/reference/version +[`&CapsOnOnly`]: https://help.keyman.com/developer/language/reference/caps +[`&CapsAlwaysOff`]: https://help.keyman.com/developer/language/reference/caps +[`&ShiftFreesCaps`]: https://help.keyman.com/developer/language/reference/caps +[`&EthnologueCode`]: https://help.keyman.com/developer/language/reference/ethnologuecode +[`&MnemonicLayout`]: https://help.keyman.com/developer/language/reference/mnemoniclayout +[`&IncludeCodes`]: https://help.keyman.com/developer/language/reference/includecodes +[`&OldCharPosMatching`]: https://help.keyman.com/developer/language/reference/oldcharposmatching +[`if(&layer)`]: https://help.keyman.com/developer/language/reference/if +[`set(&layer)`]: https://help.keyman.com/developer/language/reference/set +[`&VisualKeyboard`]: https://help.keyman.com/developer/language/reference/visualkeyboard +[`&KMW_RTL`]: https://help.keyman.com/developer/language/reference/kmw_rtl +[`&KMW_HelpFile`]: https://help.keyman.com/developer/language/reference/kmw_helpfile +[`&KMW_HelpText`]: https://help.keyman.com/developer/language/reference/kmw_helptext +[`&KMW_EmbedJS`]: https://help.keyman.com/developer/language/reference/kmw_embedjs +[`&WindowsLanguages`]: https://help.keyman.com/developer/language/reference/windowslanguages +[`if(&platform)`]: https://help.keyman.com/developer/language/reference/if +[`platform()`]: https://help.keyman.com/developer/language/reference/platform +[`if(&baselayout)`]: https://help.keyman.com/developer/language/reference/if +[`baselayout()`]: https://help.keyman.com/developer/language/reference/baselayout +[`&KeyboardVersion`]: https://help.keyman.com/developer/language/reference/keyboardversion +[`&KMW_EmbedCSS`]: https://help.keyman.com/developer/language/reference/kmw_embedcss +[`&Targets`]: https://help.keyman.com/developer/language/reference/targets +[`&CasedKeys`]: https://help.keyman.com/developer/language/reference/casedkeys +[`begin NewContext`]: https://help.keyman.com/developer/language/reference/begin +[`begin PostKeystroke`]: https://help.keyman.com/developer/language/reference/begin +[`&DisplayMap`]: https://help.keyman.com/developer/language/reference/displaymap diff --git a/core/src/ldml/C7043_ldml.md b/docs/file-formats/kmx-plus-file-format.md similarity index 98% rename from core/src/ldml/C7043_ldml.md rename to docs/file-formats/kmx-plus-file-format.md index b1d2223d55..75e1df4295 100644 --- a/core/src/ldml/C7043_ldml.md +++ b/docs/file-formats/kmx-plus-file-format.md @@ -2,7 +2,7 @@ - copied from -- Authors: MD SL +- Authors: MD SRL ## C7043.0 Introduction @@ -13,7 +13,10 @@ Draft spec PR: ## C7043.1 Principles -- The data described here is located at byte offset `dpKMXPlus`. +- When embedded in a .kmx file, the data described here is located at byte + offset `COMP_KEYBOARD_KMXPLUS.dpKMXPlus`. See + [KMX file format](kmx-file-format.md) for a full description of the .kmx + format. - All integer values are unsigned 32-bit little-endian unless otherwise specified. - All strings are UTF-16LE unless otherwise specified. (See the `strs` section.) @@ -21,7 +24,7 @@ Draft spec PR: the `strs` table. - All offsets are 32-bit little-endian values. For all sections except for the `'sect'` section (which see), offsets are relative to the beginning of each - section. + section and must fall within the `size` of the section. ## C7043.2 Sections @@ -39,8 +42,8 @@ Draft spec PR: The very first section is a table of contents listing the rest of the sections. The table of contents does not list itself. -This is the only section where all byte offsets are relative to the value of -`dpKMXPlus`. +Unlike all other sections, all byte offsets are relative to start of the `sect` +section and do not have to be located within the `size` of the section. | ∆ | Bits | Name | Description | |---|------|---------|------------------------------------------| diff --git a/docs/minimum-versions.md b/docs/minimum-versions.md index ec6a1c1626..a9a2ead26b 100644 --- a/docs/minimum-versions.md +++ b/docs/minimum-versions.md @@ -63,6 +63,12 @@ https://help.keyman.com/developer/engine/android/latest-version/ | KEYMAN_MIN_VERSION_NODE_MAJOR | 20 | | KEYMAN_MIN_VERSION_NPM | 10.5.1 | | KEYMAN_MIN_VERSION_VISUAL_STUDIO | 2019 | +| KEYMAN_VERSION_CLDR | 45 | +| KEYMAN_VERSION_ICU | 73.1 | +| KEYMAN_VERSION_ISO639_3 | 2024-05-22 | | KEYMAN_VERSION_JAVA | 11 | +| KEYMAN_VERSION_LANGTAGS | 2024-05-22 | +| KEYMAN_VERSION_LANGTAGS_SUBTAG_REGISTRY | 2024-05-16 | +| KEYMAN_VERSION_UNICODE | 15.1.0 | -> ### This file is auto-generated by min-ver.sh. Do not modify +> ### This file is auto-generated by publish-minimum-versions.sh. Do not modify diff --git a/ios/engine/KMEI/KeymanEngine/el.lproj/Localizable.strings b/ios/engine/KMEI/KeymanEngine/el.lproj/Localizable.strings index 47b3aa9de0..1bd8c7713f 100644 --- a/ios/engine/KMEI/KeymanEngine/el.lproj/Localizable.strings +++ b/ios/engine/KMEI/KeymanEngine/el.lproj/Localizable.strings @@ -44,19 +44,19 @@ "command-uninstall-keyboard-confirm" = "Θὰ θέλατε νὰ ἀπεγκαταστήσετε αὐτὸ τὸ πληκτρολόγιο;"; /* Text for the command to uninstall a lexical model */ -"command-uninstall-lexical-model" = "Ἀπεγκαταστῆτε λεξικό"; +"command-uninstall-lexical-model" = "Ἀπεγκαταστῆστε λεξικό"; /* Confirmation text to display before uninstalling a lexical model */ "command-uninstall-lexical-model-confirm" = "Θὰ θέλατε νὰ ἀπεγκαταστήσετε αὐτὸ τὸ λεξικό;"; /* Text for error when a keyboard cannot load properly */ -"error-loading-keyboard" = "Ἀδυνατοῦμε νὰ φορτώσομε τὸ πληκτρολόγιο ποὺ ζητήσατε"; +"error-loading-keyboard" = "Ἀδυναμία φορτώσεως τοῦ πληκτρολογίου ποὺ ζητήσατε"; /* Text for error when a lexical model cannot load properly */ -"error-loading-lexical-model" = "Ἀδυνατοῦμε νὰ φορτώσομε τὸ λεξικὸ ποὺ ζητήσατε"; +"error-loading-lexical-model" = "Ἀδυναμία φορτώσεως τοῦ λεξικοῦ ποὺ ζητήσατε"; /* Text for error when an installed file is unexpectedly missing */ -"error-missing-file" = "Δὲν βρέθηκε κάποιο ἀπαραίτητο ἀρχεῖο."; +"error-missing-file" = "Δὲν βρέθηκε κάποιο ἀπαιτούμενο ἀρχεῖο."; /* Text for error when an installed file is unexpectedly missing */ "error-missing-file-critical" = "Κάποιο σημαντικὸ ἀρχεῖο δὲν εὑρέθη. Παρακαλοῦμε προσπαθῆστε νὰ ἐγκαταστήσετε ἐκ νέου τὴν ἐφαρμογή."; @@ -77,7 +77,7 @@ "error-update-no-link" = "Δὲν ὑπάρχει πηγαῖος κώδικας πρὸς ἐνημέρωσιν αὐτοῦ τοῦ πακέτου"; /* Text for error when updating a resource: Keyman does not know how to update the resource */ -"error-update-not-managed" = "Ἀδυνατοῦμε νὰ ἐνημερώσομε πόρο μὴ διαχειριζόμενο ἀπὸ τὴν μηχανὴ Κῆμαν"; +"error-update-not-managed" = "Ἀδυναμία ἐνημερώσεως πόρου μὴ διαχειριζομένου ἀπὸ μηχανὴ Keyman"; /* Text for the command to open the help page of a keyboard, as shown on resource information views */ "info-command-help-keyboard" = "Βοήθεια γιὰ τὸ πληκτρολόγιο"; @@ -155,7 +155,7 @@ "menu-langsettings-toggle-correct" = "Ἐνεργοποιῆστε τὶς διορθώσεις"; /* Label for the toggle that enables predictions that is displayed within a language-specific settings menu */ -"menu-langsettings-toggle-predict" = "Ἐνεργοποιῆστε προβλέψεις"; +"menu-langsettings-toggle-predict" = "Ἐνεργοποιῆστε τὶς προβλέψεις κειμένου"; /* Help message for a prompt that appears for confirming a lexical model download: language (1): lexical model (dictionary) name (2) */ "menu-lexical-model-install-message" = "Θὰ θέλατε νὰ ἐγκαταστήσετε αὐτὸ τὸ λεξικό;"; @@ -200,13 +200,13 @@ "menu-settings-spacebar-hint-blank" = "Καμμία λεζάντα στὸ πλῆκτρο διαστήματος"; /* Secondary text showing current setting for spacebar caption - keyboard */ -"menu-settings-spacebar-hint-keyboard" = "Νὰ ἐμφανίζεται στὸ στὸ πλῆκτρο διαστήματος τὸ ὄνομα τοῦ πληκτρολογίου"; +"menu-settings-spacebar-hint-keyboard" = "Ὄνομα πληκτρολογίου στὸ πλῆκτρο διαστήματος"; /* Secondary text showing current setting for spacebar caption - language */ -"menu-settings-spacebar-hint-language" = "Νὰ ἐμφανίζεται στὸ στὸ πλῆκτρο διαστήματος τὸ ὄνομα τῆς γλώσσας"; +"menu-settings-spacebar-hint-language" = "Ὄνομα γλώσσας στὸ πλῆκτρο διαστήματος"; /* Secondary text showing current setting for spacebar caption - language + keyboard */ -"menu-settings-spacebar-hint-languageKeyboard" = "Νὰ ἐμφανίζεται στὸ στὸ πλῆκτρο διαστήματος τὸ ὄνομα τοῦ πληκτρολογίου καὶ τῆς γλώσσας"; +"menu-settings-spacebar-hint-languageKeyboard" = "Ὄνομα πληκτρολογίου καὶ γλώσσας στὸ πλῆκτρο διαστήματος"; /* Label for the "Spacebar Caption" item on the main settings screen */ "menu-settings-spacebar-text" = "Λεζάντα Πλήκτρου Διαστήματος"; diff --git a/ios/engine/KMEI/KeymanEngine/el.lproj/Localizable.stringsdict b/ios/engine/KMEI/KeymanEngine/el.lproj/Localizable.stringsdict index afaf5ae03d..b0544d994e 100644 --- a/ios/engine/KMEI/KeymanEngine/el.lproj/Localizable.stringsdict +++ b/ios/engine/KMEI/KeymanEngine/el.lproj/Localizable.stringsdict @@ -13,9 +13,9 @@ NSStringFormatValueTypeKey u one - Τὸ λεξικὸ %u ἐγκατεστάθη + Ἐγκατεστάθη %u λεξικό other - %u λεξικὰ ἐγκατεστάθησαν + Ἐγκατεστάθησαν %u λεξικά notification-update-failed @@ -31,7 +31,7 @@ one %u ἐνημέρωση ἀπέτυχε other - %u ἐνημερώσεις ἀπέτυχαν + Ἀπέτυχαν %u ἐνημερώσεις notification-update-success diff --git a/ios/keyman/Keyman/Keyman/el.lproj/Localizable.strings b/ios/keyman/Keyman/Keyman/el.lproj/Localizable.strings index 2df136fccc..d5d0fcec49 100644 --- a/ios/keyman/Keyman/Keyman/el.lproj/Localizable.strings +++ b/ios/keyman/Keyman/Keyman/el.lproj/Localizable.strings @@ -24,7 +24,7 @@ /* The name of the iOS Settings menu option for giving the keyboard full access. (The menu entry underneath the app's name within the app-specific keyboard menu.) */ -"ios-settings-allow-full-access" = "Ἐπιστρέψτε πλήρη πρόσβαση"; +"ios-settings-allow-full-access" = "Ἐπιτρέψτε πλήρη πρόσβαση"; /* Short-form used when installing a font in order to display a language properly. */ "language-for-font" = "Γραμματοσειρά %@"; @@ -60,13 +60,13 @@ underneath the app's name within the app-specific keyboard menu.) */ "menu-show-browser" = "Φυλλομετρητής"; /* Menu option used to control in-app font size. */ -"menu-text-size" = "Μέγεθος κειμένου"; +"menu-text-size" = "Μέγεθος γραμματοσειρᾶς"; /* Used to describe the current font size */ -"text-size-label" = "Μέγεθος κειμένου: %i"; +"text-size-label" = "Μέγεθος γραμματοσειρᾶς: %i"; /* Text to indicate that a user should set a toggle within iOS Settings to 'active'. */ -"toggle-to-enable" = "Ἐνεργοποιῆστε %@"; +"toggle-to-enable" = "Ἐνεργοποίηση %@"; /* First option on the Get Started tutorial - Add a keyboard for your language */ "tutorial-add-keyboard" = "Προσθέστε πληκτρολόγιο γιὰ τὴν γλῶσσα σας"; @@ -75,7 +75,7 @@ underneath the app's name within the app-specific keyboard menu.) */ "tutorial-show-help" = "Περισσότερες πληροφορίες"; /* Second option on the Get Started tutorial - Set up Keyman as system-wide keyboard */ -"tutorial-system-keyboard" = "Ὁρίστε τὸ Κῆμαν ὡς παν-συστημικὸ πληκτρολόγιο"; +"tutorial-system-keyboard" = "Ὁρίστε τὸ Κῆμαν ὡς πληκτρολόγιο ὁλοκλήρου τοῦ συστήματος"; /* Used to display app version (as in \"Version: 1.0.2\" */ "version-label" = "Ἔκδοση: %@"; diff --git a/linux/keyman-config/locale/el_polyton.po b/linux/keyman-config/locale/el_polyton.po new file mode 100644 index 0000000000..fa9797acce --- /dev/null +++ b/linux/keyman-config/locale/el_polyton.po @@ -0,0 +1,332 @@ +msgid "" +msgstr "" +"Project-Id-Version: keyman\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-08-19 19:17+0200\n" +"PO-Revision-Date: 2024-08-06 22:57\n" +"Last-Translator: \n" +"Language-Team: Greek (Polytonic)\n" +"Language: el_polyton\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Crowdin-Project: keyman\n" +"X-Crowdin-Project-ID: 386703\n" +"X-Crowdin-Language: el-polyton\n" +"X-Crowdin-File: /master/linux/keyman-config.pot\n" +"X-Crowdin-File-ID: 504\n" + +#: keyman_config/__init__.py:68 +msgid "Neither sentry-sdk nor raven is available. Not enabling Sentry error reporting." +msgstr "Δὲν εἶναι διαθέσιμα οὔτε τὸ sentry-sdk οὔτε τὸ raven. Δὲν ἐνεργοποιεῖται ἡ ἀναφορὰ σφαλμάτων Sentry." + +#: keyman_config/downloadkeyboard.py:23 +msgid "Download Keyman keyboards" +msgstr "Μεταφόρτωση πληκτρολογίων Keyman" + +#: keyman_config/downloadkeyboard.py:37 keyman_config/keyboard_details.py:49 +#: keyman_config/keyboard_details.py:340 keyman_config/view_installed.py:205 +msgid "_Close" +msgstr "_Close" + +#: keyman_config/install_kmp.py:99 +msgid "You do not have permissions to install the keyboard files to the shared area /usr/local/share/keyman" +msgstr "Δὲν σᾶς ἐπιτρέπεται νὰ ἐγκαταστήσετε τὰ ἀρχεῖα τοῦ πληκτρολογίου στὴν κοινὴ περιοχὴ /usr/local/share/keyman" + +#: keyman_config/install_kmp.py:103 +msgid "You do not have permissions to install the documentation to the shared documentation area /usr/local/share/doc/keyman" +msgstr "Δὲν σᾶς ἐπιτρέπεται νὰ ἐγκαταστήσετε τὴν τεκμηρίωση στὴν κοινὴ περιοχὴ τεκμηρίωσης /usr/local/share/doc/keyman" + +#: keyman_config/install_kmp.py:107 +msgid "You do not have permissions to install the font files to the shared font area /usr/local/share/fonts" +msgstr "Δὲν σᾶς ἐπιτρέπεται νὰ ἐγκαταστήσετε τὰ ἀρχεῖα γραμματοσειρῶν στὴν κοινὴ περιοχὴ γραμματοσειρῶν /usr/local/share/fonts" + +#: keyman_config/install_kmp.py:179 +#, python-brace-format +msgid "install_kmp.py: error: No kmp.json or kmp.inf found in {package}" +msgstr "install_kmp.py: σφάλμα: Δὲν βρέθηκε kmp.json ἢ kmp.inf στὸ {package}" + +#: keyman_config/install_kmp.py:246 +#, python-brace-format +msgid "install_kmp.py: error: No kmp.json or kmp.inf found in {packageFile}" +msgstr "install_kmp.py: σφάλμα: Δὲν βρέθηκε kmp.json ἢ kmp.inf στὸ {packageFile}" + +#: keyman_config/install_window.py:54 +#, python-brace-format +msgid "Installing keyboard/package {keyboardid}" +msgstr "Ἐγκαθίσταται πληκτρολόγιο/πακέτο {keyboardid}" + +#: keyman_config/install_window.py:72 keyman_config/install_window.py:93 +msgid "Keyboard is installed already" +msgstr "Τὸ πληκτρολόγιο ἔχει ἤδη ἐγκατασταθεῖ" + +#: keyman_config/install_window.py:74 +#, python-brace-format +msgid "The {name} keyboard is already installed at version {version}. Do you want to uninstall then reinstall it?" +msgstr "Τὸ πληκτρολόγιο {name} ἔχει ἤδη ἐγκατασταθεῖ στὴν ἔκδοση {version}. Θέλετε νὰ τὸ ἀφαιρέσετε καὶ νὰ τὸ ἐγκαταστήσετε ἐκ νέου;" + +#: keyman_config/install_window.py:95 +#, python-brace-format +msgid "The {name} keyboard is already installed with a newer version {installedversion}. Do you want to uninstall it and install the older version {version}?" +msgstr "Τὸ πληκτρολόγιο {name} ἔχει ἤδη ἐγκατασταθεῖ μὲ τὴν νεώτερη ἔκδοση {installedversion}. Θέλετε νὰ τὸ ἀφαιρέσετε καὶ νὰ ἐγκαταστήσετε τὴν παλαιότερη ἔκδοση {version};" + +#: keyman_config/install_window.py:128 +msgid "Keyboard layouts: " +msgstr "Διατάξεις πληκτρολογίου: " + +#: keyman_config/install_window.py:147 +msgid "Fonts: " +msgstr "Γραμματοσειρές: " + +#: keyman_config/install_window.py:167 keyman_config/keyboard_details.py:96 +msgid "Package version: " +msgstr "Ἔκδοση πακέτου: " + +#: keyman_config/install_window.py:179 +msgid "Author: " +msgstr "Κατασκευαστής: " + +#: keyman_config/install_window.py:197 +msgid "Website: " +msgstr "Ἱστότοπος: " + +#: keyman_config/install_window.py:211 +msgid "Copyright: " +msgstr "Πνευματικὰ δικαιώματα: " + +#: keyman_config/install_window.py:245 +msgid "Details" +msgstr "Λεπτομέρειες" + +#: keyman_config/install_window.py:248 +msgid "README" +msgstr "README" + +#: keyman_config/install_window.py:256 keyman_config/view_installed.py:200 +msgid "_Install" +msgstr "_Install" + +#: keyman_config/install_window.py:260 +msgid "_Cancel" +msgstr "_Cancel" + +#: keyman_config/install_window.py:305 +#, python-brace-format +msgid "Keyboard {name} installed" +msgstr "Τὸ πληκτρολόγιο {name} ἐγκατεστάθη" + +#: keyman_config/install_window.py:310 keyman_config/install_window.py:315 +#, python-brace-format +msgid "Keyboard {name} could not be installed." +msgstr "Τὸ πληκτρολόγιο {name} δὲν μπόρεσε νὰ ἐγκατασταθεῖ." + +#: keyman_config/install_window.py:311 +msgid "Error Message:" +msgstr "Μήνυμα σφάλματος:" + +#: keyman_config/install_window.py:316 +msgid "Warning Message:" +msgstr "Προειδοποιητικὸ μήνυμα:" + +#: keyman_config/keyboard_details.py:37 +#, python-brace-format +msgid "{name} keyboard" +msgstr "πληκτρολόγιο {name}" + +#: keyman_config/keyboard_details.py:53 +msgid "ERROR: Keyboard metadata is damaged.\n" +"Please \"Uninstall\" and then \"Install\" the keyboard." +msgstr "ΣΦΑΛΜΑ: Ζημία σὲ μεταδεδομένα πληκτρολογίου.\n" +"Παρακαλοῦμε \"Ἀπεγκαταστῆστε\" καὶ κατόπιν \"Ἐγκαταστῆστε\" τὸ πληκτρολόγιο." + +#: keyman_config/keyboard_details.py:74 +msgid "Package name: " +msgstr "Ὄνομα πακέτου: " + +#: keyman_config/keyboard_details.py:85 +msgid "Package id: " +msgstr "Id πακέτου: " + +#: keyman_config/keyboard_details.py:108 +msgid "Package description: " +msgstr "Περιγραφὴ πακέτου: " + +#: keyman_config/keyboard_details.py:121 +msgid "Package author: " +msgstr "Κατασκευαστὴς πακέτου: " + +#: keyman_config/keyboard_details.py:133 +msgid "Package copyright: " +msgstr "Πνευματικὰ δικαιώματα πακέτου: " + +#: keyman_config/keyboard_details.py:174 +msgid "Keyboard filename: " +msgstr "Ὄνομα ἀρχείου πακέτου: " + +#: keyman_config/keyboard_details.py:187 +msgid "Keyboard name: " +msgstr "Ὄνομα πληκτρολογίου: " + +#: keyman_config/keyboard_details.py:198 +msgid "Keyboard id: " +msgstr "Id πληκτρολογίου: " + +#: keyman_config/keyboard_details.py:209 +msgid "Keyboard version: " +msgstr "Ἔκδοση πληκτρολογίου: " + +#: keyman_config/keyboard_details.py:221 +msgid "Keyboard author: " +msgstr "Σχεδιαστὴς πληκτρολογίου: " + +#: keyman_config/keyboard_details.py:232 +msgid "Keyboard license: " +msgstr "Ἄδεια χρήσης πληκτρολογίου: " + +#: keyman_config/keyboard_details.py:243 +msgid "Keyboard description: " +msgstr "Περιγραφὴ πληκτρολογίου: " + +#: keyman_config/keyboard_details.py:334 +#, python-brace-format +msgid "Scan this code to load this keyboard\n" +"on another device or share online" +msgstr "Σαρῶστε αὐτὸν τὸν κωδικὸ γιὰ νὰ φορτώσετε αὐτὸ τὸ πληκτρολόγιο\n" +"σὲ ἄλλη συσκευὴ ἢ μοιρασθῆτε το ὀνλάϊν" + +#: keyman_config/options.py:24 +#, python-brace-format +msgid "{packageId} Settings" +msgstr "Ρυθμίσεις {packageId}" + +#: keyman_config/view_installed.py:30 +msgid "Keyman Configuration" +msgstr "Παράμετροι Keyman" + +#: keyman_config/view_installed.py:60 +msgid "Choose a kmp file..." +msgstr "Ἐπιλέξτε ἀρχεῖο kmp..." + +#. i18n: file type in file selection dialog +#: keyman_config/view_installed.py:65 +msgid "KMP files" +msgstr "Ἀρχεῖα KMP" + +#. i18n: column header in table displaying installed keyboards +#: keyman_config/view_installed.py:141 +msgid "Icon" +msgstr "Εἰκονίδιο" + +#. i18n: column header in table displaying installed keyboards +#: keyman_config/view_installed.py:145 +msgid "Name" +msgstr "Ὄνομα" + +#. i18n: column header in table displaying installed keyboards +#: keyman_config/view_installed.py:148 +msgid "Version" +msgstr "Ἔκδοση" + +#: keyman_config/view_installed.py:161 +msgid "_Uninstall" +msgstr "_Uninstall" + +#: keyman_config/view_installed.py:162 keyman_config/view_installed.py:304 +msgid "Uninstall keyboard" +msgstr "Ἀπεγκαταστῆστε πληκτρολόγιο" + +#: keyman_config/view_installed.py:167 +msgid "_About" +msgstr "_About" + +#: keyman_config/view_installed.py:168 keyman_config/view_installed.py:306 +msgid "About keyboard" +msgstr "Περὶ τοῦ πληκτρολογίου" + +#: keyman_config/view_installed.py:173 +msgid "_Help" +msgstr "_Help" + +#: keyman_config/view_installed.py:174 keyman_config/view_installed.py:305 +msgid "Help for keyboard" +msgstr "Βοήθεια γιὰ τὸ πληκτρολόγιο" + +#: keyman_config/view_installed.py:179 +msgid "_Options" +msgstr "_Options" + +#: keyman_config/view_installed.py:180 keyman_config/view_installed.py:307 +msgid "Settings for keyboard" +msgstr "Ρυθμίσεις πληκτρολογίου" + +#: keyman_config/view_installed.py:190 +msgid "_Refresh" +msgstr "_Refresh" + +#: keyman_config/view_installed.py:191 +msgid "Refresh keyboard list" +msgstr "Ἀνανεῶστε τὸν κατάλογο πληκτρολογίων" + +#: keyman_config/view_installed.py:195 +msgid "_Download" +msgstr "_Download" + +#: keyman_config/view_installed.py:196 +msgid "Download and install a keyboard from the Keyman website" +msgstr "Κατεβάστε καὶ ἐγκαταστῆστε πληκτρολόγιο ἀπὸ τὸν ἱστότοπο Keyman" + +#: keyman_config/view_installed.py:201 +msgid "Install a keyboard from a file" +msgstr "Ἐγκαταστῆστε πληκτρολόγιο ἀπὸ ἀρχεῖο" + +#: keyman_config/view_installed.py:206 +msgid "Close window" +msgstr "Κλεῖστε τὸ παράθυρο" + +#: keyman_config/view_installed.py:278 +#, python-brace-format +msgid "Uninstall keyboard {package}" +msgstr "Ἀπεγκαταστῆστε πληκτρολόγιο {package}" + +#: keyman_config/view_installed.py:280 +#, python-brace-format +msgid "Help for keyboard {package}" +msgstr "Βοήθεια γιὰ πληκτρολόγιο {package}" + +#: keyman_config/view_installed.py:282 +#, python-brace-format +msgid "About keyboard {package}" +msgstr "Περὶ τοῦ πληκτρολογίου {package}" + +#: keyman_config/view_installed.py:284 +#, python-brace-format +msgid "Settings for keyboard {package}" +msgstr "Ρυθμίσεις πληκτρολογίου {package}" + +#: keyman_config/view_installed.py:349 +msgid "Uninstall keyboard package?" +msgstr "Θὰ ἀπεγκαταστήσετε τὸ πακέτο πληκτρολογίου;" + +#: keyman_config/view_installed.py:351 +#, python-brace-format +msgid "Are you sure that you want to uninstall the {keyboard} keyboard and its fonts?" +msgstr "Εἶσθε βέβαιοι ὅτι θέλετε νὰ ἀπεγκαταστήσετε τὸ πληκτρολόγιο {keyboard} καὶ τὶς γραμματοσειρές του;" + +#: keyman_config/welcome.py:22 +#, python-brace-format +msgid "{name} installed" +msgstr "Τὸ {name} ἐγκατεστάθη" + +#: keyman_config/welcome.py:40 +msgid "Open in _Web browser" +msgstr "Ἀνοῖξτε στὸν φυλλομετρητὴ _Web" + +#: keyman_config/welcome.py:42 +msgid "Open in the default web browser to do things like printing" +msgstr "Ἀνοῖξτε στὸν προεπιλεγμένο φυλλομετρητὴ γιὰ νὰ ἐκτελέσετε π.χ., μία ἐκτύπωση" + +#: keyman_config/welcome.py:45 +msgid "_OK" +msgstr "_OK" + diff --git a/linux/scripts/dist.sh b/linux/scripts/dist.sh index 0038034d42..6ef0be7d8b 100755 --- a/linux/scripts/dist.sh +++ b/linux/scripts/dist.sh @@ -30,28 +30,37 @@ cp -a debian ../ cd .. echo "3.0 (native)" > debian/source/format dch keyman --newversion "${VERSION}" --force-bad-version --nomultimaint -dpkg-source --tar-ignore=*~ --tar-ignore=.git --tar-ignore=.gitattributes \ - --tar-ignore=.gitignore --tar-ignore=experiments --tar-ignore=debian \ - --tar-ignore=.github --tar-ignore=.vscode --tar-ignore=android \ +dpkg-source --tar-ignore=*~ \ + --tar-ignore=.git \ + --tar-ignore=.gitattributes \ + --tar-ignore=.gitignore \ + --tar-ignore=experiments \ + --tar-ignore=debian \ + --tar-ignore=.github \ + --tar-ignore=.vscode \ + --tar-ignore=android \ --tar-ignore=.devcontainer \ --tar-ignore=artifacts \ \ --tar-ignore=common/models \ - --tar-ignore=common/predictive-text \ --tar-ignore=common/resources \ --tar-ignore=common/schemas \ --tar-ignore=common/test/keyboards/build.* \ - --tar-ignore=common/test/predictive-text \ --tar-ignore=common/test/resources \ --tar-ignore=common/web \ --tar-ignore=common/windows \ \ --tar-ignore=core/build \ - --tar-ignore=developer --tar-ignore=docs --tar-ignore=ios \ + --tar-ignore=developer \ + --tar-ignore=docs \ + --tar-ignore=ios \ --tar-ignore=linux/keyman-config/keyman_config/version.py \ - --tar-ignore=linux/keyman-config/buildtools/build-langtags.py --tar-ignore=__pycache__ \ + --tar-ignore=linux/keyman-config/buildtools/build-langtags.py \ + --tar-ignore=__pycache__ \ --tar-ignore=linux/help \ - --tar-ignore=mac --tar-ignore=node_modules --tar-ignore=oem \ + --tar-ignore=mac \ + --tar-ignore=node_modules \ + --tar-ignore=oem \ --tar-ignore=linux/build \ --tar-ignore=linux/builddebs \ --tar-ignore=linux/ibus-keyman/build \ @@ -60,11 +69,17 @@ dpkg-source --tar-ignore=*~ --tar-ignore=.git --tar-ignore=.gitattributes \ --tar-ignore=resources/environment.sh \ --tar-ignore=resources/git-hooks \ --tar-ignore=resources/scopes \ - --tar-ignore=resources/build/*.lua --tar-ignore=resources/build/jq* \ + --tar-ignore=resources/build/*.lua \ + --tar-ignore=resources/build/jq* \ --tar-ignore=results \ --tar-ignore=tmp \ - --tar-ignore=web --tar-ignore=windows --tar-ignore=keyman_1* \ - --tar-ignore=dist --tar-ignore=VERSION -Zgzip -b . + --tar-ignore=web \ + --tar-ignore=windows \ + --tar-ignore=keyman_1* \ + --tar-ignore=dist \ + --tar-ignore=VERSION \ + \ + -Zgzip -b . mv ../keyman_"${VERSION}".tar.gz linux/dist/keyman-"${VERSION}".tar.gz echo "3.0 (quilt)" > debian/source/format cd "$BASEDIR" diff --git a/mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj b/mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj index 8e0b973442..66dac595c8 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj +++ b/mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj @@ -257,6 +257,12 @@ 29C1E1772800227700759EDE /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/KMKeyboardHelpWindowController.strings"; sourceTree = ""; }; 29C1E1782800227800759EDE /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/MainMenu.strings"; sourceTree = ""; }; 29C1E179280025A900759EDE /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/Localizable.strings"; sourceTree = ""; }; + 29D470942C648D5100224B4F /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/KMAboutWindowController.strings; sourceTree = ""; }; + 29D470952C648D5100224B4F /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/preferences.strings; sourceTree = ""; }; + 29D470962C648D5200224B4F /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/KMInfoWindowController.strings; sourceTree = ""; }; + 29D470972C648D5200224B4F /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/KMKeyboardHelpWindowController.strings; sourceTree = ""; }; + 29D470982C648D5200224B4F /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/MainMenu.strings; sourceTree = ""; }; + 29D470992C648D7100224B4F /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Localizable.strings; sourceTree = ""; }; 29DD8400276C49E20066A16E /* am */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = am; path = am.lproj/KMAboutWindowController.strings; sourceTree = ""; }; 29DD8401276C49E20066A16E /* am */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = am; path = am.lproj/preferences.strings; sourceTree = ""; }; 29DD8402276C49E30066A16E /* am */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = am; path = am.lproj/KMInfoWindowController.strings; sourceTree = ""; }; @@ -795,6 +801,7 @@ uk, ru, es, + el, ); mainGroup = 989C9BFF1A7876DE00A20425; productRefGroup = 989C9C091A7876DE00A20425 /* Products */; @@ -1053,6 +1060,7 @@ 298566D42980D47C004ACA95 /* uk */, 298566E02980E579004ACA95 /* ru */, CEFFECD82A417FEA00D58C36 /* es */, + 29D470942C648D5100224B4F /* el */, ); name = KMAboutWindowController.xib; sourceTree = ""; @@ -1079,6 +1087,7 @@ 298566D52980D47D004ACA95 /* uk */, 298566E12980E579004ACA95 /* ru */, CEFFECD92A417FEB00D58C36 /* es */, + 29D470952C648D5100224B4F /* el */, ); name = preferences.xib; path = Keyman4MacIM/KMConfiguration; @@ -1105,6 +1114,7 @@ 298566D92980D489004ACA95 /* uk */, 298566E52980E584004ACA95 /* ru */, CEFFECDD2A4180FD00D58C36 /* es */, + 29D470992C648D7100224B4F /* el */, ); name = Localizable.strings; sourceTree = ""; @@ -1131,6 +1141,7 @@ 298566D62980D47D004ACA95 /* uk */, 298566E22980E57A004ACA95 /* ru */, CEFFECDA2A417FEB00D58C36 /* es */, + 29D470962C648D5200224B4F /* el */, ); name = KMInfoWindowController.xib; path = Keyman4MacIM/KMInfoWindow; @@ -1158,6 +1169,7 @@ 298566D72980D47D004ACA95 /* uk */, 298566E32980E57A004ACA95 /* ru */, CEFFECDB2A417FEC00D58C36 /* es */, + 29D470972C648D5200224B4F /* el */, ); name = KMKeyboardHelpWindowController.xib; path = Keyman4MacIM/KMKeyboardHelpWindow; @@ -1185,6 +1197,7 @@ 298566D82980D47E004ACA95 /* uk */, 298566E42980E57A004ACA95 /* ru */, CEFFECDC2A417FEC00D58C36 /* es */, + 29D470982C648D5200224B4F /* el */, ); name = MainMenu.xib; sourceTree = ""; diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/el.lproj/KMAboutWindowController.strings b/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/el.lproj/KMAboutWindowController.strings new file mode 100644 index 0000000000..a6dc5d6122 --- /dev/null +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/el.lproj/KMAboutWindowController.strings @@ -0,0 +1,8 @@ +/* button text to close the About window */ +"Kab-Up-fYH.title" = "Κλεῖστε"; + +/* text of link to the license agreement */ +"hYC-Bx-aoP.title" = "Ἄδεια χρήσης"; + +/* button text to open Configuration window */ +"vkh-b5-vO7.title" = "Παράμετροι..."; diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/el.lproj/preferences.strings b/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/el.lproj/preferences.strings new file mode 100644 index 0000000000..6b750343d0 --- /dev/null +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/el.lproj/preferences.strings @@ -0,0 +1,38 @@ +/* Checkbox text to always show on-screen keyboard */ +"4UX-80-0Vo.title" = "Νὰ ἐμφανίζεται πάντοτε τὸ πληκτρολόγιο ὀθόνης"; + +/* Checkbox text to enable verbose Console logging */ +"7J6-zy-R20.title" = "Χρησιμοποιῆστε λεπτομερῆ καταγραφὴ μηνυμάτων κονσόλας"; + +/* Support button text */ +"93O-x6-RLF.label" = "Ὑποστήριξη"; + +/* Download Keyboard button text */ +"CTw-kf-WNS.title" = "Κατεβάστε πληκτρολόγιο..."; + +/* Keyman Configuration window title */ +"F0z-JX-Cv5.title" = "Παράμετροι Keyman"; + +/* button text to go back to previous page */ +"JOK-JV-n8w.title" = "Πίσω"; + +/* Keyboards button text */ +"MPN-9N-wWc.label" = "Πληκτρολόγια"; + +/* text to explain verbose Console logging option */ +"MrI-GM-7d6.title" = "Ὅταν εἶναι ἐνεργὴ ἡ λεπτομερὴς καταγραφὴ μηνυμάτων κονσόλας, τὸ Keyman θὰ καταγράφει ἐνέργειες ποὺ θὰ βοηθήσουν τὴν ὁμάδα ὑποστήριξης Keyman νὰ διαγνώσει τυχὸν πρόβλημα. Μὲ τὸ πρόγραμμα κονσόλας μπορεῖτε νὰ δεῖτε τὰ μηνύματα τοῦ Keyman σὲ ἀρχεῖο. Στὴν Κονσόλα φιλτράρετε καὶ προβάλετε ὅλα τὰ μηνύματα ἀπὸ τὴν διεργασία \"Keyman\". Ἂν χρειασθεῖ, αὐτὴ ἡ ἀναφορὰ μπορεῖ νὰ ἐξαχθεῖ καὶ νὰ ἀποσταλεῖ στὴν ὑποστήριξη τοῦ Keyman."; + +/* button text to move forward to the next page */ +"eXr-8V-h1g.title" = "Μπροστά"; + +/* button text to return to the home help page */ +"fXS-aC-CMH.title" = "Ἀρχική"; + +/* Options button text */ +"frd-No-seV.label" = "Ἐπιλογές"; + +/* Installed Keyboard column heading */ +"jex-Nd-Qzg.headerCell.title" = "Ἐγκατεστημένο Πληκτρολόγιο"; + +/* Verbose logging tooltip text */ +"uWx-3J-U0D.ibShadowedToolTip" = "Ἐνεργοποιῆστε ἂν ἔχετε προβλήματα μὲ ἕνα συγκεκριμένο πληκτρολόγιο ἢ μὲ τὸ Keyman γενικῶς."; diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/el.lproj/KMInfoWindowController.strings b/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/el.lproj/KMInfoWindowController.strings new file mode 100644 index 0000000000..af78cc7f5f --- /dev/null +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/el.lproj/KMInfoWindowController.strings @@ -0,0 +1,8 @@ +/* Package Information window title */ +"F0z-JX-Cv5.title" = "Πληροφορίες πακέτου"; + +/* button text to show Details */ +"Fvy-XJ-s38.label" = "Λεπτομέρειες"; + +/* button text to show Read Me */ +"waA-IW-Qyn.label" = "Read Me"; diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMKeyboardHelpWindow/el.lproj/KMKeyboardHelpWindowController.strings b/mac/Keyman4MacIM/Keyman4MacIM/KMKeyboardHelpWindow/el.lproj/KMKeyboardHelpWindowController.strings new file mode 100644 index 0000000000..ed234ea2e2 --- /dev/null +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMKeyboardHelpWindow/el.lproj/KMKeyboardHelpWindowController.strings @@ -0,0 +1,8 @@ +/* Keyboard Help window title */ +"F0z-JX-Cv5.title" = "Βοήθεια γιὰ τὸ πληκτρολόγιο"; + +/* OK button text */ +"Zla-QF-m0K.title" = "OK"; + +/* Print button text */ +"fYY-Uj-y4S.title" = "Ἐκτυπῶστε..."; diff --git a/mac/Keyman4MacIM/Keyman4MacIM/el.lproj/Localizable.strings b/mac/Keyman4MacIM/Keyman4MacIM/el.lproj/Localizable.strings new file mode 100644 index 0000000000..006c96a99c --- /dev/null +++ b/mac/Keyman4MacIM/Keyman4MacIM/el.lproj/Localizable.strings @@ -0,0 +1,74 @@ +/* Message displayed to confirm delete of the Keyman keyboard selected by the user from the keyboard list */ +"message-confirm-delete-keyboard" = "Εἶσθε βέβαιοι ὅτι θέλετε νὰ διαγράψετε τὸ πληκτρολόγιο '%@';"; + +/* Delete keyboard confirmation info indicating that the delete action cannot be undone */ +"info-cannot-undo-delete-keyboard" = "Δὲν μπορεῖτε νὰ ἀναιρέσετε αὐτὴν τὴν ἐνέργεια."; + +/* Button text to cancel delete of the specified installed Keyman keyboard */ +"button-cancel-delete-keyboard" = "Ἀκυρῶστε"; + +/* Button text to confirm delete of the specified installed Keyman keyboard */ +"button-delete-keyboard" = "Διαγράψτε"; + +/* Message displayed to confirm installation of a keyboard from the specifed .kmp file double-clicked by the user */ +"message-confirm-install-keyboard" = "Θὰ ἐγκαταστήσετε πληκτρολόγιο Keyman;"; + +/* Message displayed to confirm installation of a keyboard from the specifed .kmp file double-clicked by the user */ +"info-install-keyboard-filename" = "Θέλετε ἡ ἐφαρμογὴ Keyman νὰ ἐγκαταστήσει τὸ πληκτρολόγιο ἀπὸ τὸ ἀρχεῖο '%@';"; + +/* Button text to cancel installation of the double-clicked Keyman file */ +"button-cancel-install-keyboard" = "Ἀκυρῶστε"; + +/* Button text to confirm installation of the double-clicked Keyman file */ +"button-install-keyboard" = "Ἐγκαταστῆστε"; + +/* Message displayed to inform user that .kmp file could not be read/unzipped */ +"message-keyboard-file-unreadable" = "Δὲν μπορέσαμε νὰ διαβάσομε τὸ ἀρχεῖο Keyman '%@'."; + +/* Message displayed in Configuration window when keyboard cannot be loaded */ +"message-error-loading-keyboard" = "(σφάλμα κατὰ τὴν φόρτωση πληκτρολογίου)"; + +/* Message displayed in Configuration window when keyboard metadata cannot be loaded */ +"message-error-unknown-metadata" = "ἄγνωστο"; + +/* Button text to acknowledge that .kmp file could not be read */ +"button-keyboard-file-unreadable" = "OK"; + +/* label text to identify Keyman version */ +"version-label-text" = "Ἔκδοση: %@"; + +/* Status text for keyboard downloading */ +"message-keyboard-downloading" = "Μεταφόρτωση σὲ ἐξέλιξη..."; + +/* Status text for keyboard download complete */ +"message-keyboard-download-complete" = "Ὁλοκλήρωση φόρτωσης."; + +/* Button text to cancel downloading keyboard */ +"button-cancel-downloading" = "Ἀκυρῶστε"; + +/* Button text keyboard download complete */ +"button-download-complete" = "Ἕτοιμοι"; + +/* keyboards label in the Package Information window */ +"keyboards-label" = "Πληκτρολόγια:"; + +/* fonts label in the Package Information window */ +"fonts-label" = "Γραμματοσειρές:"; + +/* package version label in the Package Information window */ +"package-version-label" = "Ἔκδοση πακέτου:"; + +/* author label in the Package Information window */ +"author-label" = "Δημιουργός:"; + +/* website label in the Package Information window */ +"website-label" = "Ἱστότοπος:"; + +/* copyright label in the Package Information window */ +"copyright-label" = "Πνευματικὰ δικαιώματα:"; + +/* message displayed to alert user to need grant accessibility permission */ +"privacy-alert-text" = "Τὸ Keyman, γιὰ νὰ λειτουργήσει σωστά, ἀπαιτεῖ ὁρισμένες δυνατότητες προσπέλασης:\n\nἘπιτρέψτε τὴν πρόσβαση στὶς Προτιμήσεις Συστήματος, τὴν Ἀσφάλεια & Ἰδιωτικότητα.\nἘπανεκκινῆστε τὸ σύστημά σας."; + +/* Text of menu item in Input Menu when no Keyboards are configured -- include parentheses */ +"no-keyboard-configured-menu-placeholder" = "(Δὲν ἔχει ἐγκατασταθεῖ πληκτρολόγιο)"; diff --git a/mac/Keyman4MacIM/Keyman4MacIM/el.lproj/MainMenu.strings b/mac/Keyman4MacIM/Keyman4MacIM/el.lproj/MainMenu.strings new file mode 100644 index 0000000000..dc5aae4d89 --- /dev/null +++ b/mac/Keyman4MacIM/Keyman4MacIM/el.lproj/MainMenu.strings @@ -0,0 +1,14 @@ +/* Configuration window menu text */ +"P1b-lE-yFw.title" = "Διαμόρφωση..."; + +/* Keyboards menu text */ +"bQa-j9-nHe.title" = "Πληκτρολόγια"; + +/* Keyboards menu text */ +"goP-aK-3WB.title" = "Πληκτρολόγια"; + +/* About menu text */ +"kb2-ww-RS3.title" = "Περὶ ἡμῶν"; + +/* On-Screen Keyboard menu text */ +"s96-JI-YDh.title" = "Πληκτρολόγιο ὀθόνης"; diff --git a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVShared.java b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVShared.java index 95158826ba..9b75b3eea9 100644 --- a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVShared.java +++ b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVShared.java @@ -7,22 +7,25 @@ import android.content.res.AssetManager; import android.net.Uri; import android.util.Log; import android.widget.Toast; +import com.keyman.engine.JSONParser; import com.keyman.engine.KMManager; import com.keyman.engine.data.Keyboard; import com.keyman.engine.packages.PackageProcessor; import com.keyman.engine.util.KMLog; -import java.io.BufferedReader; +import org.json.JSONArray; +import org.json.JSONObject; + import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.OutputStream; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -30,6 +33,8 @@ final class FVShared { private static FVShared instance = null; private boolean isInitialized = false; + // File containing keyboard+region info for each keyboard + private static final String FVKeyboards_JSON = "keyboards.json"; private static final String FVLoadedKeyboardList = "loaded_keyboards.dat"; // Keys from earlier versions of app, used only in the upgrade process @@ -107,7 +112,8 @@ final class FVShared { } this.context = context.getApplicationContext(); - this.regionList = loadRegionList(); + String keyboardsJSONPath = getPackagesDir() + FVDefault_PackageID + File.separator + FVKeyboards_JSON; + this.regionList = loadRegionList(keyboardsJSONPath); this.loadedKeyboards = loadLoadedKeyboardList(); isInitialized = true; @@ -123,54 +129,86 @@ final class FVShared { return instance; } - private FVRegionList loadRegionList() { - FVRegionList list = new FVRegionList(); - try { - // At this point in initialization, fv_all.kmp hasn't been extracted, so - // we get all the keyboard info from keyboards.csv - InputStream inputStream = context.getAssets().open("keyboards.csv"); - BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream)); + /** + * Parse keyboards.json file to associate region info for each keyboard + * @param keyboardsJSONPath - path to the keyboards.json file containing region info for each keyboard + * @return FVRegionList + */ + private FVRegionList loadRegionList(String keyboardsJSONPath) { + FVRegionList list = new FVRegionList(); + JSONParser parser = new JSONParser(); + File jsonFile = new File(keyboardsJSONPath); + if (!jsonFile.exists()) { + // Fatal error + throw new Error("keyboards.json file doesn't exist"); + } + try { + // At this point in initialization, fv_all.kmp is now extracted, so + // populate keyboard info from keyboards.json + JSONArray keyboardsArray = parser.getJSONObjectFromFile(jsonFile, JSONArray.class); - reader.readLine(); // skip header row - String line = reader.readLine(); + if (keyboardsArray == null) { + KMLog.LogError(TAG, "Unable to parse keyboards.json"); + return list; + } - while (line != null) { - while (line.contains(",,")) - line = line.replace(",,", ", ,"); + for (int i=0; i 0) { - // Read in column info - String kbId = values[1]; - String kbName = values[2]; - String regionName = values[3]; - String legacyId = values[4]; - String version = values[5]; - String lgId = values[6].toLowerCase(); // Normalize language ID - String lgName = values[7]; + String kbID = keyboardObj.getString("id"); + String kbName = keyboardObj.getString("name"); + JSONObject languageObj = languageArray.getJSONObject(0); + String lgID = languageObj.getString("id").toLowerCase(); // Normalize language Id + String lgName = languageObj.getString("name"); - FVRegion region = list.findRegion(regionName); - if(region == null) { - region = new FVRegion(regionName); - list.add(region); - } + // Override European keyboard info + if (kbID.equalsIgnoreCase("sil_euro_latin")) { + kbName = "English"; + lgID = "en"; + lgName = "English"; + } else if (kbID.equalsIgnoreCase("basic_kbdcan")) { + kbName = "Français"; + lgID = "fr-ca"; + lgName = "French"; + } - FVKeyboard keyboard = new FVKeyboard(kbId, kbName, legacyId, version, lgId, lgName); + FVKeyboard kbd = new FVKeyboard( + kbID, + kbName, + kbID, // unused legacy ID + keyboardObj.getString("version"), + lgID, + lgName); - region.keyboards.add(keyboard); - } + region.keyboards.add(kbd); + } + } catch (Exception e) { + // loadRegionList had malformed keyboard list + throw new Error(e.getMessage()); + } - line = reader.readLine(); - } + // Sort by region name + Collections.sort(list, (r1, r2) -> r1.name.compareTo(r2.name)); - inputStream.close(); - } catch (Exception e) { - Log.e("createKeyboardList", "Error: " + e); - // We'll return a malformed list for now in this situation - } - - return list; - } + for (int i=0; i k1.name.compareTo(k2.name)); + } + return list; + } private FVLoadedKeyboardList loadLoadedKeyboardList() { FVLoadedKeyboardList data = new FVLoadedKeyboardList(); diff --git a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/MainActivity.java b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/MainActivity.java index f91657203b..d38d5b9bc0 100644 --- a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/MainActivity.java +++ b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/MainActivity.java @@ -49,17 +49,17 @@ public class MainActivity extends AppCompatActivity implements OnKeyboardDownloa setContentView(R.layout.activity_main); + if (BuildConfig.DEBUG) { + KMManager.setDebugMode(true); + } + KMManager.initialize(getApplicationContext(), KMManager.KeyboardType.KEYBOARD_TYPE_INAPP); + FVShared.getInstance().initialize(this); FVShared.getInstance().upgradeTo12(); FVShared.getInstance().upgradeTo14(); FVShared.getInstance().preloadPackages(); - if (BuildConfig.DEBUG) { - KMManager.setDebugMode(true); - } - KMManager.initialize(getApplicationContext(), KMManager.KeyboardType.KEYBOARD_TYPE_INAPP); - /** * We need to set the default (fallback) keyboard to sil_euro_latin inside the fv_all package * rather than the normal default of sil_euro_latin inside the sil_euro_latin package. diff --git a/oem/firstvoices/android/build.sh b/oem/firstvoices/android/build.sh index 3e10a79ae6..e27be06974 100755 --- a/oem/firstvoices/android/build.sh +++ b/oem/firstvoices/android/build.sh @@ -61,13 +61,9 @@ if builder_start_action clean; then fi if builder_start_action configure; then - KEYBOARDS_CSV="$KEYMAN_ROOT/oem/firstvoices/keyboards.csv" - KEYBOARDS_CSV_TARGET="$KEYMAN_ROOT/oem/firstvoices/android/app/src/main/assets/keyboards.csv" - KEYBOARD_PACKAGE_ID="fv_all" KEYBOARDS_TARGET="$KEYMAN_ROOT/oem/firstvoices/android/app/src/main/assets/${KEYBOARD_PACKAGE_ID}.kmp" - cp "$KEYBOARDS_CSV" "$KEYBOARDS_CSV_TARGET" downloadKeyboardPackage "$KEYBOARD_PACKAGE_ID" "$KEYBOARDS_TARGET" builder_finish_action success configure diff --git a/package-lock.json b/package-lock.json index 2f2ca04142..cee7d8528b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,9 +25,9 @@ "common/test/resources", "common/tools/*", "common/web/*", - "common/predictive-text", "common/tools/hextobin", - "web" + "web", + "web/src/engine/predictive-text/*" ], "dependencies": { "@keymanapp/common-types": "file:common/web/types", @@ -108,25 +108,6 @@ "typescript": "^5.4.5" } }, - "common/predictive-text": { - "name": "@keymanapp/lexical-model-layer", - "license": "MIT", - "dependencies": { - "@keymanapp/keyman-version": "*", - "@keymanapp/models-templates": "*", - "@keymanapp/models-wordbreakers": "*", - "@keymanapp/web-utils": "*", - "es6-shim": "^0.35.5", - "string.prototype.codepointat": "^0.2.1" - }, - "devDependencies": { - "@keymanapp/models-types": "*", - "@keymanapp/resources-gosh": "*", - "mocha": "^10.0.0", - "mocha-teamcity-reporter": "^4.0.0", - "typescript": "^5.4.5" - } - }, "common/test/resources": { "name": "@keymanapp/common-test-resources", "license": "MIT", @@ -191,42 +172,6 @@ "typescript": "^5.4.5" } }, - "common/web/input-processor": { - "name": "@keymanapp/input-processor", - "license": "MIT", - "dependencies": { - "@keymanapp/keyboard-processor": "*", - "@keymanapp/keyman-version": "*", - "@keymanapp/lexical-model-layer": "*", - "@keymanapp/models-types": "*", - "@keymanapp/web-utils": "*", - "eventemitter3": "^5.0.0" - }, - "devDependencies": { - "@keymanapp/kmc": "*", - "@keymanapp/resources-gosh": "*", - "mocha": "^10.0.0", - "mocha-teamcity-reporter": "^4.0.0", - "typescript": "^5.4.5" - } - }, - "common/web/keyboard-processor": { - "name": "@keymanapp/keyboard-processor", - "license": "MIT", - "dependencies": { - "@keymanapp/common-types": "*", - "@keymanapp/keyman-version": "*", - "@keymanapp/models-types": "*", - "@keymanapp/web-utils": "*" - }, - "devDependencies": { - "@keymanapp/resources-gosh": "*", - "c8": "^7.12.0", - "mocha": "^10.0.0", - "mocha-teamcity-reporter": "^4.0.0", - "typescript": "^5.4.5" - } - }, "common/web/keyman-version": { "name": "@keymanapp/keyman-version", "license": "MIT", @@ -234,49 +179,6 @@ "typescript": "^5.4.5" } }, - "common/web/lm-message-types": { - "name": "@keymanapp/lm-message-types", - "license": "MIT", - "devDependencies": { - "typescript": "^5.4.5" - } - }, - "common/web/lm-worker": { - "name": "@keymanapp/lm-worker", - "license": "MIT", - "dependencies": { - "@keymanapp/keyman-version": "*", - "@keymanapp/models-templates": "*", - "@keymanapp/models-wordbreakers": "*", - "@keymanapp/web-utils": "*", - "es6-shim": "^0.35.5", - "string.prototype.codepointat": "^0.2.1", - "string.prototype.startswith": "^0.2.0" - }, - "devDependencies": { - "@keymanapp/common-test-resources": "*", - "@keymanapp/models-types": "*", - "@keymanapp/resources-gosh": "*", - "c8": "^7.12.0", - "combine-source-map": "^0.8.0", - "mocha": "^10.0.0", - "mocha-teamcity-reporter": "^4.0.0", - "typescript": "^5.4.5" - } - }, - "common/web/recorder": { - "name": "@keymanapp/recorder-core", - "license": "MIT", - "dependencies": { - "@keymanapp/keyboard-processor": "*", - "@keymanapp/keyman-version": "*", - "@keymanapp/models-types": "*", - "@keymanapp/web-utils": "*" - }, - "devDependencies": { - "typescript": "^5.4.5" - } - }, "common/web/sentry-manager": { "name": "@keymanapp/web-sentry-manager", "license": "MIT", @@ -294,24 +196,17 @@ "dependencies": { "@keymanapp/keyman-version": "*", "@keymanapp/ldml-keyboard-constants": "*", - "restructure": "3.0.1", - "sax": ">=0.6.0", - "semver": "^7.5.2", - "xmlbuilder": "~11.0.0" + "restructure": "3.0.1" }, "devDependencies": { "@types/chai": "^4.1.7", - "@types/git-diff": "^2.0.3", "@types/mocha": "^5.2.7", "@types/node": "^20.4.1", - "@types/semver": "^7.3.12", - "@types/xml2js": "^0.4.5", "ajv": "^8.12.0", "ajv-cli": "^5.0.0", "ajv-formats": "^2.1.1", "c8": "^7.12.0", "chalk": "^2.4.2", - "git-diff": "^2.0.6", "hexy": "^0.3.4", "mocha": "^8.4.0", "typescript": "^5.4.5" @@ -493,7 +388,7 @@ "name": "@keymanapp/developer-test-helpers", "license": "MIT", "dependencies": { - "@keymanapp/common-types": "*" + "@keymanapp/developer-utils": "*" }, "devDependencies": { "@types/node": "^20.4.1", @@ -504,11 +399,21 @@ "name": "@keymanapp/developer-utils", "license": "MIT", "dependencies": { - "@sentry/node": "^7.57.0" + "@keymanapp/common-types": "*", + "@sentry/node": "^7.57.0", + "eventemitter3": "^5.0.0", + "restructure": "^3.0.1", + "sax": ">=0.6.0", + "semver": "^7.5.2", + "xmlbuilder": "~11.0.0" }, "devDependencies": { + "@types/git-diff": "^2.0.3", "@types/node": "^20.4.1", + "@types/semver": "^7.3.12", + "@types/xml2js": "^0.4.5", "c8": "^7.12.0", + "git-diff": "^2.0.6", "mocha": "^8.4.0", "typescript": "^5.4.5" } @@ -1244,6 +1149,7 @@ "name": "@keymanapp/kmc-ldml", "license": "MIT", "dependencies": { + "@keymanapp/developer-utils": "*", "@keymanapp/keyman-version": "*", "@keymanapp/kmc-kmn": "*", "@keymanapp/ldml-keyboard-constants": "*", @@ -1689,6 +1595,7 @@ "license": "MIT", "dependencies": { "@keymanapp/common-types": "*", + "@keymanapp/developer-utils": "*", "jszip": "^3.7.0", "marked": "^7.0.0" }, @@ -2033,7 +1940,11 @@ "multer": "^1.4.5-lts.1", "ngrok": "^5.0.0-beta.2", "open": "^8.4.0", - "ws": "^8.17.1" + "restructure": "^3.0.1", + "sax": ">=0.6.0", + "semver": "^7.5.2", + "ws": "^8.17.1", + "xmlbuilder": "~11.0.0" }, "devDependencies": { "@keymanapp/keyman-version": "*", @@ -2045,12 +1956,12 @@ "@types/ws": "^8.2.2", "copyfiles": "^2.4.1", "mocha": "^10.0.0", + "node-gyp": "^10.2.0", "tsc-watch": "^4.5.0", "typescript": "^5.4.5" }, "optionalDependencies": { - "hetrodo-node-hide-console-window-napi": "keymanapp/hetrodo-node-hide-console-window-napi#keyman-15.0", - "node-windows-trayicon": "keymanapp/node-windows-trayicon#keyman-16.0" + "node-hide-console-window": "^2.2.0" } }, "developer/src/server/node_modules/@types/mocha": { @@ -2090,12 +2001,12 @@ } }, "node_modules/@75lb/deep-merge": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@75lb/deep-merge/-/deep-merge-1.1.1.tgz", - "integrity": "sha512-xvgv6pkMGBA6GwdyJbNAnDmfAIR/DfWhrj9jgWh3TY7gRm3KO46x/GPjRg6wJ0nOepwqrNxFfojebh0Df4h4Tw==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@75lb/deep-merge/-/deep-merge-1.1.2.tgz", + "integrity": "sha512-08K9ou5VNbheZFxM5tDWoqjA3ImC50DiuuJ2tj1yEPRfkp8lLLg6XAaJ4On+a0yAXor/8ay5gHnAIshRM44Kpw==", "dev": true, "dependencies": { - "lodash.assignwith": "^4.2.0", + "lodash": "^4.17.21", "typical": "^7.1.1" }, "engines": { @@ -2690,12 +2601,6 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, - "node_modules/@gar/promisify": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", - "optional": true - }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.14", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", @@ -2737,6 +2642,102 @@ "integrity": "sha512-tWZNBIS1CoekcwlMuyG2mr0a1Wo5lb5lEHwwWvZo+5GLgr3e9LLDTtmgtCWEwBpXMkxn9D+2W9j2FY6eZQq0tA==", "dev": true }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true + }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/@istanbuljs/schema": { "version": "0.1.3", "dev": true, @@ -2801,14 +2802,6 @@ "resolved": "common/tools/hextobin", "link": true }, - "node_modules/@keymanapp/input-processor": { - "resolved": "common/web/input-processor", - "link": true - }, - "node_modules/@keymanapp/keyboard-processor": { - "resolved": "common/web/keyboard-processor", - "link": true - }, "node_modules/@keymanapp/keyman-version": { "resolved": "common/web/keyman-version", "link": true @@ -2850,15 +2843,15 @@ "link": true }, "node_modules/@keymanapp/lexical-model-layer": { - "resolved": "common/predictive-text", + "resolved": "web/src/engine/predictive-text/worker-main", "link": true }, "node_modules/@keymanapp/lm-message-types": { - "resolved": "common/web/lm-message-types", + "resolved": "web/src/engine/predictive-text/types", "link": true }, "node_modules/@keymanapp/lm-worker": { - "resolved": "common/web/lm-worker", + "resolved": "web/src/engine/predictive-text/worker-thread", "link": true }, "node_modules/@keymanapp/models-templates": { @@ -2874,7 +2867,7 @@ "link": true }, "node_modules/@keymanapp/recorder-core": { - "resolved": "common/web/recorder", + "resolved": "web/src/tools/testing/recorder-core", "link": true }, "node_modules/@keymanapp/resources-gosh": { @@ -3250,43 +3243,80 @@ "node": ">= 8" } }, - "node_modules/@npmcli/fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", - "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", - "optional": true, + "node_modules/@npmcli/agent": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz", + "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==", + "dev": true, + "dependencies": { + "agent-base": "^7.1.0", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.1", + "lru-cache": "^10.0.1", + "socks-proxy-agent": "^8.0.3" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/agent/node_modules/agent-base": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", + "dev": true, + "dependencies": { + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@npmcli/agent/node_modules/debug": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/@npmcli/agent/node_modules/https-proxy-agent": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", + "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", + "dev": true, + "dependencies": { + "agent-base": "^7.0.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@npmcli/agent/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true + }, + "node_modules/@npmcli/fs": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", + "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", + "dev": true, "dependencies": { - "@gar/promisify": "^1.1.3", "semver": "^7.3.5" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@npmcli/move-file": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", - "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", - "deprecated": "This functionality has been moved to @npmcli/fs", - "optional": true, - "dependencies": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@npmcli/move-file/node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "optional": true, - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/@octokit/auth-token": { @@ -3441,6 +3471,16 @@ "@octokit/openapi-types": "^11.2.0" } }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "optional": true, + "engines": { + "node": ">=14" + } + }, "node_modules/@puppeteer/browsers": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.2.2.tgz", @@ -4284,15 +4324,6 @@ "node": ">=10" } }, - "node_modules/@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", - "optional": true, - "engines": { - "node": ">= 10" - } - }, "node_modules/@tootallnate/quickjs-emscripten": { "version": "0.23.0", "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz", @@ -5522,10 +5553,13 @@ } }, "node_modules/abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "optional": true + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", + "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", + "dev": true, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } }, "node_modules/accepts": { "version": "1.3.8", @@ -5571,7 +5605,7 @@ }, "node_modules/agent-base": { "version": "6.0.2", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "debug": "4" @@ -5580,25 +5614,11 @@ "node": ">= 6.0.0" } }, - "node_modules/agentkeepalive": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz", - "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==", - "optional": true, - "dependencies": { - "debug": "^4.1.0", - "depd": "^1.1.2", - "humanize-ms": "^1.2.1" - }, - "engines": { - "node": ">= 8.0.0" - } - }, "node_modules/aggregate-error": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "optional": true, + "dev": true, "dependencies": { "clean-stack": "^2.0.0", "indent-string": "^4.0.0" @@ -5772,36 +5792,6 @@ "version": "1.0.0", "license": "MIT" }, - "node_modules/aproba": { - "version": "2.0.0", - "license": "ISC", - "optional": true - }, - "node_modules/are-we-there-yet": { - "version": "3.0.1", - "license": "ISC", - "optional": true, - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/are-we-there-yet/node_modules/readable-stream": { - "version": "3.6.0", - "license": "MIT", - "optional": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/arg": { "version": "4.1.3", "dev": true, @@ -5973,7 +5963,7 @@ }, "node_modules/balanced-match": { "version": "1.0.0", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/bare-events": { @@ -6063,15 +6053,6 @@ "node": ">=8" } }, - "node_modules/bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "optional": true, - "dependencies": { - "file-uri-to-path": "1.0.0" - } - }, "node_modules/body-parser": { "version": "1.20.2", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", @@ -6127,7 +6108,7 @@ }, "node_modules/brace-expansion": { "version": "1.1.11", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", @@ -6253,93 +6234,104 @@ } }, "node_modules/cacache": { - "version": "16.1.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", - "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", - "optional": true, + "version": "18.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz", + "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==", + "dev": true, "dependencies": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^2.0.0", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^8.0.1", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", + "@npmcli/fs": "^3.1.0", + "fs-minipass": "^3.0.0", + "glob": "^10.2.2", + "lru-cache": "^10.0.1", + "minipass": "^7.0.3", + "minipass-collect": "^2.0.1", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^9.0.0", + "ssri": "^10.0.0", "tar": "^6.1.11", - "unique-filename": "^2.0.0" + "unique-filename": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/cacache/node_modules/brace-expansion": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "optional": true, + "dev": true, "dependencies": { "balanced-match": "^1.0.0" } }, - "node_modules/cacache/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "optional": true, + "node_modules/cacache/node_modules/foreground-child": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz", + "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", + "dev": true, "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" }, "engines": { - "node": ">=12" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/cacache/node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dev": true, + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, "node_modules/cacache/node_modules/lru-cache": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.16.1.tgz", - "integrity": "sha512-9kkuMZHnLH/8qXARvYSjNvq8S1GYFFzynQTAfKeaJ0sIrR3PUPuu37Z+EiIANiZBvpfTf2B5y8ecDLSMWlLv+w==", - "optional": true, - "engines": { - "node": ">=12" - } + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true }, "node_modules/cacache/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "optional": true, + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, "dependencies": { "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=10" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/cacache/node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "optional": true, - "bin": { - "mkdirp": "bin/cmd.js" - }, + "node_modules/cacache/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, "engines": { - "node": ">=10" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/cache-content-type": { @@ -6516,7 +6508,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "optional": true, + "dev": true, "engines": { "node": ">=10" } @@ -6569,7 +6561,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "optional": true, + "dev": true, "engines": { "node": ">=6" } @@ -6696,14 +6688,6 @@ "version": "1.1.4", "license": "MIT" }, - "node_modules/color-support": { - "version": "1.1.3", - "license": "ISC", - "optional": true, - "bin": { - "color-support": "bin.js" - } - }, "node_modules/combine-source-map": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz", @@ -6812,7 +6796,7 @@ }, "node_modules/concat-map": { "version": "0.0.1", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/concat-stream": { @@ -6828,11 +6812,6 @@ "typedarray": "^0.0.6" } }, - "node_modules/console-control-strings": { - "version": "1.1.0", - "license": "ISC", - "optional": true - }, "node_modules/content-disposition": { "version": "0.5.4", "license": "MIT", @@ -7139,12 +7118,12 @@ }, "node_modules/delegates": { "version": "1.0.0", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/depd": { "version": "1.1.2", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -7214,6 +7193,12 @@ "dev": true, "license": "MIT" }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true + }, "node_modules/ee-first": { "version": "1.1.1", "license": "MIT" @@ -7272,7 +7257,7 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", - "optional": true, + "dev": true, "engines": { "node": ">=6" } @@ -7281,7 +7266,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "optional": true + "dev": true }, "node_modules/errorstacks": { "version": "2.4.1", @@ -8519,6 +8504,12 @@ "which": "bin/which" } }, + "node_modules/exponential-backoff": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", + "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", + "dev": true + }, "node_modules/express": { "version": "4.19.2", "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", @@ -8726,12 +8717,6 @@ "node": "^10.12.0 || >=12.0.0" } }, - "node_modules/file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", - "optional": true - }, "node_modules/fill-range": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", @@ -8885,20 +8870,20 @@ } }, "node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "optional": true, + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "dev": true, "dependencies": { - "minipass": "^3.0.0" + "minipass": "^7.0.3" }, "engines": { - "node": ">= 8" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/fs.realpath": { "version": "1.0.0", - "devOptional": true, + "dev": true, "license": "ISC" }, "node_modules/fsevents": { @@ -8948,72 +8933,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/gauge": { - "version": "4.0.4", - "license": "ISC", - "optional": true, - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/gauge/node_modules/ansi-regex": { - "version": "5.0.1", - "license": "MIT", - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/gauge/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "license": "MIT", - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/gauge/node_modules/string-width": { - "version": "4.2.3", - "license": "MIT", - "optional": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/gauge/node_modules/strip-ansi": { - "version": "6.0.1", - "license": "MIT", - "optional": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/gauge/node_modules/wide-align": { - "version": "1.1.5", - "license": "ISC", - "optional": true, - "dependencies": { - "string-width": "^1.0.2 || 2 || 3 || 4" - } - }, "node_modules/get-caller-file": { "version": "2.0.5", "license": "ISC", @@ -9211,7 +9130,7 @@ }, "node_modules/glob": { "version": "7.1.6", - "devOptional": true, + "dev": true, "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", @@ -9326,7 +9245,7 @@ }, "node_modules/graceful-fs": { "version": "4.2.10", - "devOptional": true, + "dev": true, "license": "ISC" }, "node_modules/graphemer": { @@ -9419,11 +9338,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/has-unicode": { - "version": "2.0.1", - "license": "ISC", - "optional": true - }, "node_modules/hasown": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", @@ -9444,17 +9358,6 @@ "he": "bin/he" } }, - "node_modules/hetrodo-node-hide-console-window-napi": { - "name": "node-hide-console-window", - "version": "2.0.1", - "resolved": "git+ssh://git@github.com/keymanapp/hetrodo-node-hide-console-window-napi.git#858b23036a9963b40ad6ff3c5bacd421e5839b92", - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, "node_modules/hexy": { "version": "0.3.4", "dev": true, @@ -9518,8 +9421,9 @@ } }, "node_modules/http-cache-semantics": { - "version": "4.1.0", - "license": "BSD-2-Clause" + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" }, "node_modules/http-errors": { "version": "2.0.0", @@ -9553,17 +9457,45 @@ } }, "node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "optional": true, + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "dev": true, "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" + "agent-base": "^7.1.0", + "debug": "^4.3.4" }, "engines": { - "node": ">= 6" + "node": ">= 14" + } + }, + "node_modules/http-proxy-agent/node_modules/agent-base": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", + "dev": true, + "dependencies": { + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/http-proxy-agent/node_modules/debug": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, "node_modules/http2-wrapper": { @@ -9581,7 +9513,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "devOptional": true, + "dev": true, "dependencies": { "agent-base": "6", "debug": "4" @@ -9590,15 +9522,6 @@ "node": ">= 6" } }, - "node_modules/humanize-ms": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", - "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", - "optional": true, - "dependencies": { - "ms": "^2.0.0" - } - }, "node_modules/iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -9672,7 +9595,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "devOptional": true, + "dev": true, "engines": { "node": ">=0.8.19" } @@ -9681,17 +9604,11 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "optional": true, + "dev": true, "engines": { "node": ">=8" } }, - "node_modules/infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", - "optional": true - }, "node_modules/inflation": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/inflation/-/inflation-2.1.0.tgz", @@ -9703,7 +9620,7 @@ }, "node_modules/inflight": { "version": "1.0.6", - "devOptional": true, + "dev": true, "license": "ISC", "dependencies": { "once": "^1.3.0", @@ -9758,7 +9675,26 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz", "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==", - "devOptional": true + "dev": true + }, + "node_modules/ip-address": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", + "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", + "dev": true, + "dependencies": { + "jsbn": "1.1.0", + "sprintf-js": "^1.1.3" + }, + "engines": { + "node": ">= 12" + } + }, + "node_modules/ip-address/node_modules/sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", + "dev": true }, "node_modules/ipaddr.js": { "version": "1.9.1", @@ -9940,7 +9876,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", - "optional": true + "dev": true }, "node_modules/is-module": { "version": "1.0.0", @@ -10177,6 +10113,21 @@ "node": ">=8" } }, + "node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "dev": true, + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, "node_modules/jju": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", @@ -10200,6 +10151,12 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/jsbn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", + "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", + "dev": true + }, "node_modules/jsdom": { "version": "23.0.1", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-23.0.1.tgz", @@ -10269,19 +10226,6 @@ } } }, - "node_modules/jsdom/node_modules/http-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz", - "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==", - "dev": true, - "dependencies": { - "agent-base": "^7.1.0", - "debug": "^4.3.4" - }, - "engines": { - "node": ">= 14" - } - }, "node_modules/jsdom/node_modules/https-proxy-agent": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz", @@ -10640,12 +10584,6 @@ "dev": true, "license": "MIT" }, - "node_modules/lodash.assignwith": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz", - "integrity": "sha512-ZznplvbvtjK2gMvnQ1BR/zqPFZmS6jbK4p+6Up4xcRYA7yMIwxHCfbTcrYxXKzzqLsQ05eJPVznEW3tuwV7k1g==", - "dev": true - }, "node_modules/lodash.camelcase": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", @@ -10844,39 +10782,26 @@ "peer": true }, "node_modules/make-fetch-happen": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", - "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", - "optional": true, + "version": "13.0.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz", + "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==", + "dev": true, "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^16.1.0", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", + "@npmcli/agent": "^2.0.0", + "cacache": "^18.0.0", + "http-cache-semantics": "^4.1.1", "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", + "minipass": "^7.0.2", + "minipass-fetch": "^3.0.0", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "negotiator": "^0.6.3", + "proc-log": "^4.2.0", "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^9.0.0" + "ssri": "^10.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/lru-cache": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.16.1.tgz", - "integrity": "sha512-9kkuMZHnLH/8qXARvYSjNvq8S1GYFFzynQTAfKeaJ0sIrR3PUPuu37Z+EiIANiZBvpfTf2B5y8ecDLSMWlLv+w==", - "optional": true, - "engines": { - "node": ">=12" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/map-stream": { @@ -10975,7 +10900,7 @@ }, "node_modules/minimatch": { "version": "3.1.2", - "devOptional": true, + "dev": true, "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" @@ -10989,41 +10914,38 @@ "license": "MIT" }, "node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "optional": true, - "dependencies": { - "yallist": "^4.0.0" - }, + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, "engines": { - "node": ">=8" + "node": ">=16 || 14 >=14.17" } }, "node_modules/minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "optional": true, + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", + "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", + "dev": true, "dependencies": { - "minipass": "^3.0.0" + "minipass": "^7.0.3" }, "engines": { - "node": ">= 8" + "node": ">=16 || 14 >=14.17" } }, "node_modules/minipass-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", - "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", - "optional": true, + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", + "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", + "dev": true, "dependencies": { - "minipass": "^3.1.6", + "minipass": "^7.0.3", "minipass-sized": "^1.0.3", "minizlib": "^2.1.2" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" }, "optionalDependencies": { "encoding": "^0.1.13" @@ -11033,7 +10955,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", - "optional": true, + "dev": true, "dependencies": { "minipass": "^3.0.0" }, @@ -11041,11 +10963,23 @@ "node": ">= 8" } }, + "node_modules/minipass-flush/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/minipass-pipeline": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", - "optional": true, + "dev": true, "dependencies": { "minipass": "^3.0.0" }, @@ -11053,11 +10987,23 @@ "node": ">=8" } }, + "node_modules/minipass-pipeline/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/minipass-sized": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", - "optional": true, + "dev": true, "dependencies": { "minipass": "^3.0.0" }, @@ -11065,11 +11011,23 @@ "node": ">=8" } }, + "node_modules/minipass-sized/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/minizlib": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "optional": true, + "dev": true, "dependencies": { "minipass": "^3.0.0", "yallist": "^4.0.0" @@ -11078,6 +11036,18 @@ "node": ">= 8" } }, + "node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/mitt": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz", @@ -11433,12 +11403,6 @@ "integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==", "dev": true }, - "node_modules/node-addon-api": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", - "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", - "optional": true - }, "node_modules/node-cleanup": { "version": "2.1.2", "dev": true, @@ -11463,44 +11427,134 @@ } }, "node_modules/node-gyp": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.3.1.tgz", - "integrity": "sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==", - "optional": true, + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz", + "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==", + "dev": true, "dependencies": { "env-paths": "^2.2.0", - "glob": "^7.1.4", + "exponential-backoff": "^3.1.1", + "glob": "^10.3.10", "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.0.3", - "nopt": "^6.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", + "make-fetch-happen": "^13.0.0", + "nopt": "^7.0.0", + "proc-log": "^4.1.0", "semver": "^7.3.5", - "tar": "^6.1.2", - "which": "^2.0.2" + "tar": "^6.2.1", + "which": "^4.0.0" }, "bin": { "node-gyp": "bin/node-gyp.js" }, "engines": { - "node": "^12.13 || ^14.13 || >=16" + "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/node-windows-trayicon": { - "name": "windows-trayicon", - "version": "3.0.0", - "resolved": "git+ssh://git@github.com/keymanapp/node-windows-trayicon.git#b3dda72327141cd99b4e21d3f5d7002bb17c2131", + "node_modules/node-gyp/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/node-gyp/node_modules/foreground-child": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz", + "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/node-gyp/node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dev": true, + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/node-gyp/node_modules/isexe": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", + "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", + "dev": true, + "engines": { + "node": ">=16" + } + }, + "node_modules/node-gyp/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/node-gyp/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/node-gyp/node_modules/which": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", + "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "dev": true, + "dependencies": { + "isexe": "^3.1.1" + }, + "bin": { + "node-which": "bin/which.js" + }, + "engines": { + "node": "^16.13.0 || >=18.0.0" + } + }, + "node_modules/node-hide-console-window": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/node-hide-console-window/-/node-hide-console-window-2.2.0.tgz", + "integrity": "sha512-CNLpd14IJbDQqzl6ryrpc4tjB2modRV+OvKekuu0KvLhqBj7ybmDWTXxHexG6LRrWW55Hfky/ZyZheh0xVXxDg==", "hasInstallScript": true, - "license": "MIT", "optional": true, "os": [ "win32" - ], - "dependencies": { - "bindings": "^1.5.0", - "node-addon-api": "^3.1.0", - "node-gyp": "^9.1.0" - } + ] }, "node_modules/noms": { "version": "0.0.0", @@ -11533,18 +11587,18 @@ "license": "MIT" }, "node_modules/nopt": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", - "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", - "optional": true, + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", + "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", + "dev": true, "dependencies": { - "abbrev": "^1.0.0" + "abbrev": "^2.0.0" }, "bin": { "nopt": "bin/nopt.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/normalize-path": { @@ -11582,20 +11636,6 @@ "node": ">=4" } }, - "node_modules/npmlog": { - "version": "6.0.2", - "license": "ISC", - "optional": true, - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/number-is-nan": { "version": "1.0.1", "dev": true, @@ -11801,7 +11841,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "optional": true, + "dev": true, "dependencies": { "aggregate-error": "^3.0.0" }, @@ -11860,19 +11900,6 @@ } } }, - "node_modules/pac-proxy-agent/node_modules/http-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", - "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", - "dev": true, - "dependencies": { - "agent-base": "^7.1.0", - "debug": "^4.3.4" - }, - "engines": { - "node": ">= 14" - } - }, "node_modules/pac-proxy-agent/node_modules/https-proxy-agent": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz", @@ -11886,20 +11913,6 @@ "node": ">= 14" } }, - "node_modules/pac-proxy-agent/node_modules/socks-proxy-agent": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz", - "integrity": "sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==", - "dev": true, - "dependencies": { - "agent-base": "^7.1.1", - "debug": "^4.3.4", - "socks": "^2.7.1" - }, - "engines": { - "node": ">= 14" - } - }, "node_modules/pac-resolver": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz", @@ -11913,6 +11926,12 @@ "node": ">= 14" } }, + "node_modules/package-json-from-dist": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", + "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", + "dev": true + }, "node_modules/pako": { "version": "1.0.11", "license": "(MIT AND Zlib)" @@ -11970,7 +11989,7 @@ }, "node_modules/path-is-absolute": { "version": "1.0.1", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -11989,6 +12008,28 @@ "dev": true, "license": "MIT" }, + "node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "dev": true, + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true + }, "node_modules/path-to-regexp": { "version": "0.1.7", "license": "MIT" @@ -12097,6 +12138,15 @@ "node": ">= 0.8.0" } }, + "node_modules/proc-log": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz", + "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==", + "dev": true, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/process-nextick-args": { "version": "2.0.1", "license": "MIT" @@ -12109,17 +12159,11 @@ "node": ">=0.4.0" } }, - "node_modules/promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", - "optional": true - }, "node_modules/promise-retry": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", - "optional": true, + "dev": true, "dependencies": { "err-code": "^2.0.2", "retry": "^0.12.0" @@ -12193,19 +12237,6 @@ } } }, - "node_modules/proxy-agent/node_modules/http-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", - "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", - "dev": true, - "dependencies": { - "agent-base": "^7.1.0", - "debug": "^4.3.4" - }, - "engines": { - "node": ">= 14" - } - }, "node_modules/proxy-agent/node_modules/https-proxy-agent": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz", @@ -12228,20 +12259,6 @@ "node": ">=12" } }, - "node_modules/proxy-agent/node_modules/socks-proxy-agent": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz", - "integrity": "sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==", - "dev": true, - "dependencies": { - "agent-base": "^7.1.1", - "debug": "^4.3.4", - "socks": "^2.7.1" - }, - "engines": { - "node": ">= 14" - } - }, "node_modules/proxy-from-env": { "version": "1.1.0", "dev": true, @@ -12613,13 +12630,14 @@ "node_modules/restructure": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/restructure/-/restructure-3.0.1.tgz", - "integrity": "sha512-6neDpI/yE9eogQo22qmWwKIA9wFPRyYjQleDEh6zaNAf2ZPqLJYUvNBJBWEWNoBlCeQMQkvIOe2YI/K2GOag+g==" + "integrity": "sha512-6neDpI/yE9eogQo22qmWwKIA9wFPRyYjQleDEh6zaNAf2ZPqLJYUvNBJBWEWNoBlCeQMQkvIOe2YI/K2GOag+g==", + "license": "MIT" }, "node_modules/retry": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", - "optional": true, + "dev": true, "engines": { "node": ">= 4" } @@ -12636,7 +12654,7 @@ }, "node_modules/rimraf": { "version": "3.0.2", - "devOptional": true, + "dev": true, "license": "ISC", "dependencies": { "glob": "^7.1.3" @@ -12879,11 +12897,6 @@ "node": ">= 0.8.0" } }, - "node_modules/set-blocking": { - "version": "2.0.0", - "license": "ISC", - "optional": true - }, "node_modules/set-immediate-shim": { "version": "1.0.1", "license": "MIT", @@ -13069,45 +13082,57 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", - "devOptional": true, + "dev": true, "engines": { "node": ">= 6.0.0", "npm": ">= 3.0.0" } }, "node_modules/socks": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz", - "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==", - "devOptional": true, + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", + "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", + "dev": true, "dependencies": { - "ip": "^2.0.0", + "ip-address": "^9.0.5", "smart-buffer": "^4.2.0" }, "engines": { - "node": ">= 10.13.0", + "node": ">= 10.0.0", "npm": ">= 3.0.0" } }, "node_modules/socks-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", - "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", - "optional": true, + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz", + "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==", + "dev": true, "dependencies": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" + "agent-base": "^7.1.1", + "debug": "^4.3.4", + "socks": "^2.8.3" }, "engines": { - "node": ">= 10" + "node": ">= 14" + } + }, + "node_modules/socks-proxy-agent/node_modules/agent-base": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", + "dev": true, + "dependencies": { + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" } }, "node_modules/socks-proxy-agent/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "optional": true, + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "dev": true, "dependencies": { "ms": "2.1.2" }, @@ -13156,15 +13181,15 @@ "dev": true }, "node_modules/ssri": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", - "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", - "optional": true, + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "dev": true, "dependencies": { - "minipass": "^3.1.1" + "minipass": "^7.0.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/statuses": { @@ -13237,6 +13262,51 @@ "node": ">=0.10.0" } }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/string.prototype.codepointat": { "version": "0.2.1", "license": "MIT" @@ -13300,6 +13370,28 @@ "node": ">=0.10.0" } }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", @@ -13410,7 +13502,7 @@ "version": "6.2.1", "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", - "optional": true, + "dev": true, "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", @@ -13448,11 +13540,35 @@ "streamx": "^2.15.0" } }, + "node_modules/tar/node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dev": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/tar/node_modules/fs-minipass/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/tar/node_modules/minipass": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "optional": true, + "dev": true, "engines": { "node": ">=8" } @@ -13461,7 +13577,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "optional": true, + "dev": true, "bin": { "mkdirp": "bin/cmd.js" }, @@ -13853,27 +13969,27 @@ "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" }, "node_modules/unique-filename": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", - "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", - "optional": true, + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", + "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "dev": true, "dependencies": { - "unique-slug": "^3.0.0" + "unique-slug": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/unique-slug": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", - "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", - "optional": true, + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", + "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "dev": true, "dependencies": { "imurmurhash": "^0.1.4" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/universal-user-agent": { @@ -14049,7 +14165,7 @@ }, "node_modules/which": { "version": "2.0.2", - "devOptional": true, + "dev": true, "license": "ISC", "dependencies": { "isexe": "^2.0.0" @@ -14156,6 +14272,68 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/wrap-ansi/node_modules/ansi-regex": { "version": "5.0.1", "license": "MIT", @@ -14567,8 +14745,6 @@ "name": "keyman", "license": "MIT", "dependencies": { - "@keymanapp/input-processor": "*", - "@keymanapp/keyboard-processor": "*", "@keymanapp/keyman-version": "*", "@keymanapp/lexical-model-layer": "*", "@keymanapp/models-types": "*", @@ -14587,6 +14763,67 @@ "jsdom": "^23.0.1", "mocha": "^10.0.0" } + }, + "web/src/engine/predictive-text/types": { + "name": "@keymanapp/lm-message-types", + "license": "MIT", + "devDependencies": { + "typescript": "^5.4.5" + } + }, + "web/src/engine/predictive-text/worker-main": { + "name": "@keymanapp/lexical-model-layer", + "license": "MIT", + "dependencies": { + "@keymanapp/keyman-version": "*", + "@keymanapp/models-templates": "*", + "@keymanapp/models-wordbreakers": "*", + "@keymanapp/web-utils": "*", + "es6-shim": "^0.35.5", + "string.prototype.codepointat": "^0.2.1" + }, + "devDependencies": { + "@keymanapp/models-types": "*", + "@keymanapp/resources-gosh": "*", + "mocha": "^10.0.0", + "mocha-teamcity-reporter": "^4.0.0", + "typescript": "^5.4.5" + } + }, + "web/src/engine/predictive-text/worker-thread": { + "name": "@keymanapp/lm-worker", + "license": "MIT", + "dependencies": { + "@keymanapp/keyman-version": "*", + "@keymanapp/models-templates": "*", + "@keymanapp/models-wordbreakers": "*", + "@keymanapp/web-utils": "*", + "es6-shim": "^0.35.5", + "string.prototype.codepointat": "^0.2.1", + "string.prototype.startswith": "^0.2.0" + }, + "devDependencies": { + "@keymanapp/common-test-resources": "*", + "@keymanapp/models-types": "*", + "@keymanapp/resources-gosh": "*", + "c8": "^7.12.0", + "combine-source-map": "^0.8.0", + "mocha": "^10.0.0", + "mocha-teamcity-reporter": "^4.0.0", + "typescript": "^5.4.5" + } + }, + "web/src/tools/testing/recorder-core": { + "name": "@keymanapp/recorder-core", + "license": "MIT", + "dependencies": { + "@keymanapp/keyman-version": "*", + "@keymanapp/models-types": "*", + "@keymanapp/web-utils": "*" + }, + "devDependencies": { + "typescript": "^5.4.5" + } } } } diff --git a/package.json b/package.json index 638f2b2fad..3f0012db10 100644 --- a/package.json +++ b/package.json @@ -50,9 +50,9 @@ "common/test/resources", "common/tools/*", "common/web/*", - "common/predictive-text", "common/tools/hextobin", - "web" + "web", + "web/src/engine/predictive-text/*" ], "dependencies": { "@keymanapp/common-types": "file:common/web/types", diff --git a/resources/build/builder.md b/resources/build/builder.md index 3855288392..0e3ef901f7 100644 --- a/resources/build/builder.md +++ b/resources/build/builder.md @@ -229,6 +229,14 @@ builder_describe \ "--feature=FOO Enable feature foo" ``` +## Constraining build targets by platform or tooling + +You can use [`builder_describe_platform`](#builderdescribeplatform-function) to +constrain certain targets to only run on specific platforms or if specific +toolchains are installed. + +## Parsing command line + After describing the available parameters, you need to pass the command line parameters in for parsing and validation: @@ -555,6 +563,48 @@ repository root, not filesystem root. -------------------------------------------------------------------------------- +## `builder_describe_platform` function + +Describes the platforms for which a given target will be available, and +filters the list of targets accordingly, removing targets that cannot be built +on the current platform. Removed targets will be listed in a separate section +in the help documentation. + +### Usage + +```bash +builder_describe_platform :target platform[,...] [:target platform[,...] ...] +``` + +### Parameters + +* `target platform[s]` ...: Target and its list of corresponding platform(s) + +### Description + +Multiple targets can be listed. Each target must be followed by a comma +separated list of platforms. The currently supported platforms are: + +Operating System platforms: +* `win`: Windows +* `mac`: macOS +* `linux`: Linux + +Development tooling platforms: +* `delphi`: Delphi is installed (Windows only) +* `android-studio`: Android Studio is installed (`$ANDROID_HOME` variable) + +Targets not specified will be built on all platforms. + +### Example + +```bash +builder_describe_platform \ + :tike win,delphi +``` + +-------------------------------------------------------------------------------- + ## `builder_display_usage` function Prints the help for the script, constructed from the [`builder_describe`] @@ -795,6 +845,21 @@ available anyway. -------------------------------------------------------------------------------- +## `builder_is_target_excluded_by_platform` function + +Returns `true` (aka 0) if the target has been excluded from the build because +it is for a different platform, or because the required tools are not installed. + +### Usage + +```bash +if builder_is_target_excluded_by_platform $target; then + ... +fi +``` + +-------------------------------------------------------------------------------- + ## `builder_parse` function Initializes a build.sh script, parses command line. Will abort the script if diff --git a/resources/build/minimum-versions.inc.sh b/resources/build/minimum-versions.inc.sh index ff49c867f1..97f2509406 100644 --- a/resources/build/minimum-versions.inc.sh +++ b/resources/build/minimum-versions.inc.sh @@ -1,6 +1,11 @@ -# Required minimum versions (also used as default version) -# Minimum versions as of Keyman 18 -# (https://docs.google.com/document/d/1Uy3U2YXeA4rCEbUbT7O6QzUGJDZBeViFecL8fjUOLkE/edit?usp=sharing) +# Required minimum versions as of Keyman 18.0 +# +# This is a list of minimum, maximum, and specific versions of any external +# components or dependencies found in Keyman. +# +# https://docs.google.com/document/d/1Uy3U2YXeA4rCEbUbT7O6QzUGJDZBeViFecL8fjUOLkE/edit?usp=sharing + +# NOTE: After changing any values, you should run publish-minimum-versions.sh. # shellcheck shell=bash disable=SC2034 # SC2034: X appears unused. @@ -15,11 +20,12 @@ KEYMAN_MIN_TARGET_VERSION_CHROME=95.0 # Final version that runs on Andro # Dependency versions KEYMAN_MIN_VERSION_NODE_MAJOR=20 # node version source of truth is /package.json:/engines/node KEYMAN_MIN_VERSION_NPM=10.5.1 # 10.5.0 has bug, discussed in #10350 -KEYMAN_MIN_VERSION_EMSCRIPTEN=3.1.44 # Warning: 3.1.45 is bad (#9529); newer versions work -KEYMAN_MAX_VERSION_EMSCRIPTEN=3.1.58 # See #9529 +KEYMAN_MIN_VERSION_EMSCRIPTEN=3.1.58 # Use KEYMAN_USE_EMSDK to automatically update to this version KEYMAN_MIN_VERSION_VISUAL_STUDIO=2019 KEYMAN_MIN_VERSION_MESON=1.0.0 +KEYMAN_VERSION_ICU=73.1 # See /core/subprojects/icu-minimal.wrap + # Language and runtime versions KEYMAN_VERSION_JAVA=11 # We're using Java/OpenJDK 11 KEYMAN_MIN_VERSION_CPP=17 # C++17 @@ -27,3 +33,10 @@ KEYMAN_MIN_VERSION_ANDROID_SDK=21 # Default version used in Docker containers KEYMAN_DEFAULT_VERSION_UBUNTU_CONTAINER=noble # Ubuntu 24.04 Noble + +# Data versions -- see resources/standards-data/readme.md +KEYMAN_VERSION_CLDR=45 # LDML Keyboards version +KEYMAN_VERSION_ISO639_3=2024-05-22 # Date of last import +KEYMAN_VERSION_LANGTAGS=2024-05-22 # Date of last import +KEYMAN_VERSION_LANGTAGS_SUBTAG_REGISTRY=2024-05-16 # Date of last import +KEYMAN_VERSION_UNICODE=15.1.0 # UCD + related data diff --git a/resources/build/publish-minimum-versions.sh b/resources/build/publish-minimum-versions.sh index e915b84b87..cf3f255767 100755 --- a/resources/build/publish-minimum-versions.sh +++ b/resources/build/publish-minimum-versions.sh @@ -34,7 +34,7 @@ function generate_table { done echo "" - echo "> ### This file is auto-generated by min-ver.sh. Do not modify" + echo "> ### This file is auto-generated by publish-minimum-versions.sh. Do not modify" } cp "$KEYMAN_ROOT/docs/minimum-versions.md.in" "$KEYMAN_ROOT/docs/minimum-versions.md" diff --git a/resources/build/test/builder-platform.test.sh b/resources/build/test/builder-platform.test.sh new file mode 100755 index 0000000000..78b40fb348 --- /dev/null +++ b/resources/build/test/builder-platform.test.sh @@ -0,0 +1,61 @@ +#!/usr/bin/env bash + +set -eu + +## START STANDARD BUILD SCRIPT INCLUDE +# adjust relative paths as necessary +THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" +. "${THIS_SCRIPT%/*}/../../../resources/builder.inc.sh" +# END STANDARD BUILD SCRIPT INCLUDE + +. "${THIS_SCRIPT_PATH}/test-utils.inc.sh" + +# Test overrides which disable win, delphi + +BUILDER_PLATFORM_OVERRIDE=linux +BUILDER_TOOLS_OVERRIDE= + +builder_describe \ + "Tests platform requirements" \ + build \ + :linux-project \ + :mac-project \ + :win-project \ + :delphi-project + +builder_describe_platform \ + :linux-project linux \ + :mac-project mac \ + :win-project win \ + :delphi-project win,delphi + +assert-equal "${_builder_targets[*]}" ":linux-project" "_builder_targets" + +# seems bash associative array order is unstable? so sort array for test +readarray -t btebp_sorted < <(printf '%s\n' "${!_builder_targets_excluded_by_platform[@]}" | sort) +assert-equal "${btebp_sorted[*]}" ":delphi-project :mac-project :win-project" "_builder_targets_excluded_by_platform" + +# Test overrides with enable win, delphi + +BUILDER_PLATFORM_OVERRIDE=win +BUILDER_TOOLS_OVERRIDE=(delphi) + +builder_describe \ + "Tests platform requirements" \ + build \ + :linux-project \ + :mac-project \ + :win-project \ + :delphi-project + +builder_describe_platform \ + :linux-project linux \ + :mac-project mac \ + :win-project win \ + :delphi-project win,delphi + +readarray -t bt_sorted < <(printf '%s\n' "${_builder_targets[@]}" | sort) +assert-equal "${bt_sorted[*]}" ":delphi-project :win-project" "_builder_targets" + +readarray -t btebp_sorted < <(printf '%s\n' "${!_builder_targets_excluded_by_platform[@]}" | sort) +assert-equal "${btebp_sorted[*]}" ":linux-project :mac-project" "_builder_targets_excluded_by_platform" diff --git a/resources/build/test/test-utils.inc.sh b/resources/build/test/test-utils.inc.sh new file mode 100644 index 0000000000..47f0aca33e --- /dev/null +++ b/resources/build/test/test-utils.inc.sh @@ -0,0 +1,14 @@ +function assert-equal() { + local actual="$1" + local expected="$2" + local message= + if [[ $# -gt 2 ]]; then + message="$3: " + fi + + if [[ "$actual" != "$expected" ]]; then + builder_die "FAIL: ${message}expected actual '$actual' to equal expected '$expected'" + else + builder_echo green "PASS: ${message}expected actual '$actual' to be equal to expected '$expected'" + fi +} diff --git a/resources/build/test/test.sh b/resources/build/test/test.sh index 60c86072b0..1cbaa25476 100755 --- a/resources/build/test/test.sh +++ b/resources/build/test/test.sh @@ -206,6 +206,10 @@ echo -e "${COLOR_BLUE}## Running dependency tests${COLOR_RESET}" "$THIS_SCRIPT_PATH/debug-deps/test.sh" "$THIS_SCRIPT_PATH/ignored-flags/test.sh" +echo -e "${COLOR_BLUE}## Test builder.inc.sh platform and tool constraints${COLOR_RESET}" +"$THIS_SCRIPT_PATH/builder-platform.test.sh" + + echo -e "${COLOR_BLUE}## Test builder.inc.sh 'builder-style' script${COLOR_RESET}" ./builder-invalid-script.test.sh || builder_die "FAIL: builder-invalid-script.test.sh returned failure code $?" diff --git a/resources/build/trigger-definitions.inc.sh b/resources/build/trigger-definitions.inc.sh index 8876cb727b..aa8312f453 100644 --- a/resources/build/trigger-definitions.inc.sh +++ b/resources/build/trigger-definitions.inc.sh @@ -50,7 +50,7 @@ bc_test_linux=(KeymanLinux_TestPullRequests Keyman_Linux_Test_Integration Keyman bc_test_mac=(Keyman_KeymanMac_PullRequests Keyman_Common_KPAPI_TestPullRequests_macOS) bc_test_windows=(KeymanDesktop_TestPullRequests KeymanDesktop_TestPrRenderOnScreenKeyboards Keyman_Common_KPAPI_TestPullRequests_Windows) bc_test_web=(Keymanweb_TestPullRequests Keyman_Common_LMLayer_TestPullRequests Keyman_Common_KPAPI_TestPullRequests_WASM) -bc_test_developer=(Keyman_Developer_Test) +bc_test_developer=(Keyman_Developer_Test Keyman_Test_Developer_Mac Keyman_Test_Developer_Linux) bc_test_common_web=(Keyman_Test_Common_Web) bc_test_common_windows=(Keyman_Test_Common_Windows) @@ -135,3 +135,15 @@ bc_stable_17_0_web=(Keymanweb_Build) bc_stable_17_0_developer=(Keyman_Developer_Release) vcs_stable_17_0=HttpsGithubComKeymanappKeyman + +# Stable 17.0 Build Configurations + +bc_stable_18_0_android=(KeymanAndroid_Build) +bc_stable_18_0_ios=(Keyman_iOS_Master) +bc_stable_18_0_linux=(KeymanLinux_Master deb-release-packaging_GitHub) +bc_stable_18_0_mac=(KeymanMac_Master) +bc_stable_18_0_windows=(Keyman_Build) +bc_stable_18_0_web=(Keymanweb_Build) +bc_stable_18_0_developer=(Keyman_Developer_Release) + +vcs_stable_18_0=HttpsGithubComKeymanappKeyman diff --git a/resources/build/version/package.json b/resources/build/version/package.json index da551fef28..ef27eb0fa1 100644 --- a/resources/build/version/package.json +++ b/resources/build/version/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@types/semver": "^7.1.0", "@types/yargs": "^17.0.26", - "semver": "^7.5.2" + "semver": "^7.5.4" }, "files": [ "src" diff --git a/resources/builder.inc.sh b/resources/builder.inc.sh index 9dc7f17994..b233614029 100755 --- a/resources/builder.inc.sh +++ b/resources/builder.inc.sh @@ -834,6 +834,7 @@ builder_describe() { _builder_deps=() # array of all dependencies for this script _builder_options_inheritable=() # array of all options that should be passed to child scripts _builder_default_action=build + declare -A -g _builder_targets_excluded_by_platform=() declare -A -g _builder_params declare -A -g _builder_options_short declare -A -g _builder_options_var @@ -865,6 +866,7 @@ builder_describe() { IFS="=" read -r -a sub <<< "$value" target_path="${sub[@]:1}" value="${sub[0]}" + original_value="$value" if [[ ! -d "$THIS_SCRIPT_PATH/$target_path" ]]; then builder_die "Target path '$target_path' for $value does not exist." fi @@ -1325,7 +1327,14 @@ _builder_parse_expanded_parameters() { # apply the selected action to all targets if [[ ! -z $target ]]; then # A target was specified but is not valid - _builder_parameter_error "$0" target "$target" + if builder_is_target_excluded_by_platform "$target"; then + builder_echo red "$0: Target $target is unavailable because it requires ${_builder_targets_excluded_by_platform[$target]}" + echo + builder_display_usage + exit 64 + else + _builder_parameter_error "$0" target "$target" + fi fi for e in "${_builder_targets[@]}"; do @@ -1392,7 +1401,17 @@ _builder_parse_expanded_parameters() { ;; *) # script does not recognize anything of action or target form at this point. - if builder_is_child_build; then + if [[ $key =~ ^: ]]; then + # This is an unsupported target + if builder_is_target_excluded_by_platform "$key"; then + builder_echo red "$0: Target $key is unavailable because it requires ${_builder_targets_excluded_by_platform[$key]}" + echo + builder_display_usage + exit 64 + else + _builder_parameter_error "$0" target "$key" + fi + elif builder_is_child_build; then # For child builds, don't fail the build when pass inheritable # parameters (#11408) builder_echo_debug "Parameter '$key' is not supported, ignoring" @@ -1520,6 +1539,19 @@ builder_display_usage() { _builder_pad $width " $e" "$description" done + if [[ ${#_builder_targets_excluded_by_platform[@]} -gt 0 ]]; then + echo + echo "Unavailable Targets: " + for e in "${!_builder_targets_excluded_by_platform[@]}"; do + if [[ ! -z "${_builder_params[$e]+x}" ]]; then + description="${_builder_params[$e]}" + else + description=$(_builder_get_default_description "$e") + fi + _builder_pad $width " $e" "$description (requires ${_builder_targets_excluded_by_platform[$e]})" + done + fi + echo echo "Options: " @@ -1893,6 +1925,126 @@ _builder_has_function_been_called() { return 1 } +################################################################################ +# Platform restrictions +################################################################################ + +# Describes the platforms for which a given target will be available, and +# filters the list of targets accordingly, removing targets that cannot be built +# on the current platform. Removed targets will be listed in a separate section +# in the help documentation. +# +# Parameters: target platform[s] ... Target and its list of corresponding +# platform(s) +# +# Multiple targets can be listed. Each target must be followed by a comma +# separated list of platforms. The currently supported platforms are: +# +# Operating System platforms: +# win Windows +# mac macOS +# linux Linux +# +# Development tooling platforms: +# delphi Delphi is installed (on Windows only) +# android Android Studio is installed +# +builder_describe_platform() { + + local builder_platforms=(linux mac win) + local builder_tools=(android-studio delphi) + + # --- Detect platform --- + + # Default value, since it's the most general case/configuration to detect. + local builder_platform=linux + + # This is copied from build-utils.sh to avoid creating a dependency on it + if [[ $OSTYPE == darwin* ]]; then + builder_platform=mac + elif [[ $OSTYPE == msys ]]; then + builder_platform=win + elif [[ $OSTYPE == cygwin ]]; then + builder_platform=win + fi + + # --- Detect tools --- + + local builder_installed_tools=() + + # Detect delphi compiler (see also delphi_environment.inc.sh) + if [[ $builder_platform == win ]]; then + local ProgramFilesx86="$(cygpath -w -F 42)" + if [[ -x "$(cygpath -u "$ProgramFilesx86\\Embarcadero\\Studio\\20.0\\bin\\dcc32.exe")" ]]; then + builder_installed_tools+=(delphi) + fi + fi + + # Detect Android Studio based on ANDROID_HOME environment variable + if [[ ! -z ${ANDROID_HOME+x} ]]; then + builder_installed_tools+=(android-studio) + fi + + # --- Overrides --- + + # For testing, we can override the current platform + if [[ ! -z "${BUILDER_PLATFORM_OVERRIDE+x}" ]]; then + builder_warn "BUILDER_PLATFORM_OVERRIDE variable found. Overriding detected platform '$builder_platform' with '$BUILDER_PLATFORM_OVERRIDE'" + builder_platform="$BUILDER_PLATFORM_OVERRIDE" + fi + + # For testing, we can override the current tools + if [[ ! -z "${BUILDER_TOOLS_OVERRIDE+x}" ]]; then + builder_warn "BUILDER_TOOLS_OVERRIDE variable found. Overriding detected tools (${builder_installed_tools[@]}) with (${BUILDER_TOOLS_OVERRIDE[@]})" + builder_installed_tools=("${BUILDER_TOOLS_OVERRIDE[@]}") + fi + + # --- Exclude targets depending on missing tools and platforms + while [[ $# -gt 1 ]]; do + local target="$1" + shift + local platforms platform + IFS="," read -r -a platforms <<< "$1" + shift + + for platform in "${platforms[@]}"; do + if _builder_item_in_array "$platform" "${builder_platforms[@]}"; then + # Check operating system + if [[ "$platform" != "$builder_platform" ]]; then + _builder_targets_excluded_by_platform[$target]=$platform + _builder_targets=( ${_builder_targets[@]/$target} ) + fi + elif _builder_item_in_array "$platform" "${builder_tools[@]}"; then + # Check installed tools + if ! _builder_item_in_array "$platform" "${builder_installed_tools[@]}"; then + _builder_targets_excluded_by_platform[$target]=$platform + _builder_targets=( ${_builder_targets[@]/$target} ) + fi + else + builder_warn "Available platforms: ${builder_platforms[@]}" + builder_warn "Available tools: ${builder_tools[@]}" + builder_die "Invalid platform or tool specified for builder_describe_platforms: $platform" + fi + done + done +} + +# Returns 0 if the specified target is excluded by platform requirements +# +# Parameters: target Target to verify +# +builder_is_target_excluded_by_platform() { + local target="$1" + if [[ ! -z "${_builder_targets_excluded_by_platform[$target]+x}" ]]; then + return 0 + fi + return 1 +} + +################################################################################ +# Final initialization +################################################################################ + # # Initialize builder once all functions are declared # diff --git a/resources/locate_emscripten.inc.sh b/resources/locate_emscripten.inc.sh index be66adfa32..f678e8449e 100644 --- a/resources/locate_emscripten.inc.sh +++ b/resources/locate_emscripten.inc.sh @@ -1,31 +1,73 @@ # shellcheck shell=bash # no hashbang for .inc.sh +. "$KEYMAN_ROOT/resources/build/minimum-versions.inc.sh" + # -# We don't want to rely on emcc.py being on the path, because Emscripten puts far +# We don't want to rely on emcc being on the path, because Emscripten puts far # too many things onto the path (in particular for us, node). # -# The following comment suggests that we don't need emcc.py on the path. +# The following comment suggests that we don't need emcc on the path. # https://github.com/emscripten-core/emscripten/issues/4848#issuecomment-1097357775 # -# So we try and locate emcc.py in common locations ourselves. The search pattern +# So we try and locate emcc in common locations ourselves. The search pattern # is: # # 1. Look for $EMSCRIPTEN_BASE (our primary emscripten variable), which should -# point to the folder that emcc.py is located in -# 2. Look for $EMCC which should point to the emcc.py executable -# 3. Look for emcc.py on the path +# point to the folder that emcc is located in +# 2. Look for $EMCC which should point to the emcc executable +# 3. Look for emcc on the path # locate_emscripten() { + local EMCC_EXECUTABLE + if [[ "${BUILDER_OS}" == "win" ]]; then + EMCC_EXECUTABLE="emcc.py" + else + EMCC_EXECUTABLE="emcc" + fi if [[ -z ${EMSCRIPTEN_BASE+x} ]]; then if [[ -z ${EMCC+x} ]]; then - local EMCC=`which emcc.py` - [[ -z $EMCC ]] && builder_die "locate_emscripten: Could not locate emscripten (emcc.py) on the path or with \$EMCC or \$EMSCRIPTEN_BASE" + local EMCC=$(which ${EMCC_EXECUTABLE}) + [[ -z $EMCC ]] && builder_die "locate_emscripten: Could not locate emscripten (${EMCC_EXECUTABLE}) on the path or with \$EMCC or \$EMSCRIPTEN_BASE" fi - [[ -f $EMCC && ! -x $EMCC ]] && builder_die "locate_emscripten: Variable EMCC ($EMCC) points to emcc.py but it is not executable" - [[ -x $EMCC ]] || builder_die "locate_emscripten: Variable EMCC ($EMCC) does not point to a valid executable emcc.py" + [[ -f $EMCC && ! -x $EMCC ]] && builder_die "locate_emscripten: Variable EMCC ($EMCC) points to ${EMCC_EXECUTABLE} but it is not executable" + [[ -x $EMCC ]] || builder_die "locate_emscripten: Variable EMCC ($EMCC) does not point to a valid executable ${EMCC_EXECUTABLE}" EMSCRIPTEN_BASE="$(dirname "$EMCC")" fi - [[ -f ${EMSCRIPTEN_BASE}/emcc.py && ! -x ${EMSCRIPTEN_BASE}/emcc.py ]] && builder_die "locate_emscripten: Variable EMSCRIPTEN_BASE ($EMSCRIPTEN_BASE) contains emcc.py but it is not executable" - [[ -x ${EMSCRIPTEN_BASE}/emcc.py ]] || builder_die "locate_emscripten: Variable EMSCRIPTEN_BASE ($EMSCRIPTEN_BASE) does not point to emcc.py's folder" + [[ -f ${EMSCRIPTEN_BASE}/${EMCC_EXECUTABLE} && ! -x ${EMSCRIPTEN_BASE}/${EMCC_EXECUTABLE} ]] && builder_die "locate_emscripten: Variable EMSCRIPTEN_BASE ($EMSCRIPTEN_BASE) contains ${EMCC_EXECUTABLE} but it is not executable" + [[ -x ${EMSCRIPTEN_BASE}/${EMCC_EXECUTABLE} ]] || builder_die "locate_emscripten: Variable EMSCRIPTEN_BASE ($EMSCRIPTEN_BASE) does not point to ${EMCC_EXECUTABLE}'s folder" + + verify_emscripten_version +} + +# Ensure that we use correct version of emsdk on build agents. +# For developers, define KEYMAN_USE_SDK to do this on your +# build machine. +verify_emscripten_version() { + if [[ "$VERSION_ENVIRONMENT" != local || ! -z "${KEYMAN_USE_EMSDK+x}" ]]; then + _select_emscripten_version_with_emsdk + fi +} + +# Use emsdk to select the appropriate version of Emscripten +# according to minimum-versions.inc.sh +_select_emscripten_version_with_emsdk() { + if [[ -z "${EMSCRIPTEN_BASE+x}" ]]; then + builder_die "Variable EMSCRIPTEN_BASE must be set" + fi + + if [[ -z "${KEYMAN_MIN_VERSION_EMSCRIPTEN+x}" ]]; then + builder_die "Variable KEYMAN_MIN_VERSION_EMSCRIPTEN must be set" + fi + + pushd "${EMSCRIPTEN_BASE}/../.." > /dev/null + if [[ ! -f emsdk ]]; then + builder_die "emsdk[.bat] should be in $(pwd)" + fi + + export EMSDK_KEEP_DOWNLOADS=1 + git pull + ./emsdk install "$KEYMAN_MIN_VERSION_EMSCRIPTEN" + ./emsdk activate "$KEYMAN_MIN_VERSION_EMSCRIPTEN" + popd > /dev/null } diff --git a/resources/standards-data/readme.md b/resources/standards-data/readme.md index ffe621c592..51d2079929 100644 --- a/resources/standards-data/readme.md +++ b/resources/standards-data/readme.md @@ -6,14 +6,13 @@ the version data in this file also. ## Current Versions +See [minimum-versions.md](../../docs/minimum-versions.md) + +Unversioned data: + | data | version | |----------------------------|-------------| | ethnologue | ? | -| iso639-3 | 2024-05-22 | -| langtags | 2024-05-22 | -| langtags-subtag-registry | 2024-05-16 | -| ldml-keyboards | 45 | -| unicode-character-database | 15.1.0 | | windows-lcid-to-bcp-47 | ? | ## File Sources diff --git a/tsconfig.base.json b/tsconfig.base.json index 2d2321747d..7f69376372 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -26,14 +26,12 @@ "paths": { "@keymanapp/common-types": ["./common/web/types/src/main"], - "@keymanapp/input-processor": ["./common/web/input-processor/src"], - "@keymanapp/keyboard-processor": ["./common/web/keyboard-processor/src"], "@keymanapp/keyman": ["./web" ], "@keymanapp/models-types": ["./common/models/types"], "@keymanapp/models-templates": ["./common/models/templates"], "@keymanapp/models-wordbreakers": ["./common/models/wordbreakers"], "@keymanapp/web-utils": ["./common/web/utils"], - "@keymanapp/lm-message-types": ["./common/web/lm-message-types"], + "@keymanapp/lm-message-types": ["./web/src/engine/predictive-text/types"], "@keymanapp/keyman-version": ["./common/web/keyman-version"], "@keymanapp/ldml-keyboard-constants": [ "./core/include/ldml" ], } diff --git a/tsconfig.json b/tsconfig.json index 3d6c66b3b4..1a02e20ff1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,16 +5,11 @@ { "path": "./common/models/templates/tsconfig.json" }, { "path": "./common/models/types/tsconfig.json" }, { "path": "./common/models/wordbreakers/tsconfig.json" }, - { "path": "./common/predictive-text/tsconfig.all.json" }, { "path": "./common/tools/hextobin/" }, { "path": "./common/web/gesture-recognizer/tsconfig.json" }, { "path": "./common/web/gesture-recognizer/src/tools/unit-test-resources/tsconfig.json" }, - { "path": "./common/web/input-processor/tsconfig.json" }, - { "path": "./common/web/keyboard-processor/tsconfig.json" }, { "path": "./common/web/keyman-version" }, - { "path": "./common/web/lm-message-types/" }, - { "path": "./common/web/lm-worker/" }, { "path": "./common/web/recorder/tsconfig.json" }, { "path": "./common/web/sentry-manager/src/tsconfig.json" }, { "path": "./common/web/types/" }, @@ -45,7 +40,10 @@ { "path": "./resources/build/version/" }, { "path": "./web/src/tsconfig.all.json" }, + { "path": "./web/src/engine/predictive-text/types/" }, + { "path": "./web/src/engine/predictive-text/worker-main/tsconfig.all.json" }, + { "path": "./web/src/engine/predictive-text/worker-thread" }, // { "path": "./web/tools/recorder/tsconfig.json" }, // { "path": "./web/tools/sourcemap-root/tsconfig.json" }, ] -} \ No newline at end of file +} diff --git a/web/README.md b/web/README.md index 7558c2a2c2..f09fe519bb 100644 --- a/web/README.md +++ b/web/README.md @@ -9,33 +9,38 @@ configure your build environment. The following folders contain the distribution for Keyman Engine for Web: - src Source code - build/app/resources OSK + UI resources for inclusion in all build types; - keymanweb-osk.ttf is maintained at https://github.com/silnrsi/font-keymanweb-osk +```text +src Source code +build/app/resources OSK + UI resources for inclusion in all build types; + keymanweb-osk.ttf is maintained at https://github.com/silnrsi/font-keymanweb-osk - build/app/browser/release Fully-compiled KeymanWeb modules for release - build/app/webview/release Fully-compiled KMEA/KMEI modules for inclusion in mobile app builds - build/app/browser/debug Fully-compiled but non-minified KeymanWeb modules - build/app/webview/debug Fully-compiled but non-minified KMEA/KMEI modules +build/app/browser/release Fully-compiled KeymanWeb modules for release +build/app/webview/release Fully-compiled KMEA/KMEI modules for inclusion in + mobile app builds +build/app/browser/debug Fully-compiled but non-minified KeymanWeb modules +build/app/webview/debug Fully-compiled but non-minified KMEA/KMEI modules - src/samples Sample pages demonstrating ways to link with KeymanWeb - src/test/manual Test-case web-pages for various aspects of KeymanWeb functionality - src/test/auto A Node-driven test suite for automated testing of KeymanWeb +src/samples Sample pages demonstrating ways to link with KeymanWeb +src/test/manual Test-case web-pages for various aspects of KeymanWeb functionality +src/test/auto A Node-driven test suite for automated testing of KeymanWeb +``` ********************************************************************** ## Usage + Open **index.html** or **samples/index.html** in your browser. Be sure to compile Keyman Engine for Web before viewing the pages. Refer to the samples for usage details. To view pages using compiled Keyman Engine for Web, + 1. cd to **keyman/web/** 2. Run `./build.sh` - Use `./build.sh --help` for the script's documentation. -### Unit Testing ### +### Unit Testing Before running unit tests on Keyman Engine for Web, first run `./build.sh` according to the instructions above. @@ -45,13 +50,14 @@ on your local machine in-browser. Alternatively, see `test.sh`, which the former command executes. ### Debugging Unit Tests + 1. During development, to run a specific unit test, change the `it` to `it.only`. You can also run all tests under a specific group with `describe.only`. 2. From this directory, run `./test.sh --debug`. Alternatively, from `web/` or any `web/` subdirectory, - ``` + ```bash npm run test -- --debug ``` @@ -68,69 +74,79 @@ the former command executes. ### Approximate Overall Design ```mermaid +--- +title: Dependency Graph +--- +%% For rendering, use e.g. https://mermaid.live +%%{init: {"flowchart": {"htmlLabels": false}} }%% graph TD; - OSK[web/src/engine/osk]; - KP["common/web/keyboard-processor"]; - IP["common/web/input-processor"]; - OSK-->KP; - IP-->KP; - Utils["common/web/utils"]; - KP---->Utils; - Wordbreakers["common/models/wordbreakers"]; - Models["common/models/templates"]; - Models-->Utils; - LMWorker["common/web/lm-worker"]; + OSK["/web/src/engine/osk"]; + KeyboardSpec["/web/src/engine/keyboard"]; + JSProc["/web/src/engine/js-processor"]; + OSK-->KeyboardSpec; + WebUtils["@keymanapp/web-utils
(/common/web/utils)"]; + KeyboardSpec---->WebUtils; + Wordbreakers["@keymanapp/models-wordbreakers
(/common/models/wordbreakers)"]; + Models["@keymanapp/models-templates
(/common/models/templates)"]; + Models-->WebUtils; + LMWorker["@keymanapp/lm-worker
(/web/src/engine/predictive-text/worker-thread)"]; LMWorker-->Models; LMWorker-->Wordbreakers; - LMLayer["common/predictive-text"]; + LMLayer["@keymanapp/lexical-model-layer
(/web/src/engine/predictive-text/worker-main)"]; LMLayer-->LMWorker; - IP-->LMLayer; + Gestures["@keymanapp/gesture-recognizer
(/common/web/gesture-recognizer)"]; + Gestures-->WebUtils; - subgraph PredText["WebWorker + its interface"] + subgraph PredText["PredText: WebWorker + its interface"] LMLayer; LMWorker; Models; Wordbreakers; end - subgraph Headless["Fully headless components"] + subgraph Headless["`**Headless** + Fully headless components`"] direction LR - KP; - IP; - Utils; + KeyboardSpec; + JSProc-->KeyboardSpec; + WebUtils; PredText; + Gestures; end - subgraph ClassicWeb["Previously unmodularized components"] - Device[web/src/engine/device-detect]; - Device----->Utils; - Elements[web/src/engine/element-wrappers]; - Elements-->KP; - KeyboardCache[web/src/engine/package-cache]; - KeyboardCache-->IP; - DomUtils[web/src/engine/dom-utils]; - DomUtils-->Utils; + subgraph ClassicWeb["`**ClassicWeb** + Intermediate-level engine modules`"] + Device["/web/src/engine/device-detect"]; + Device----->WebUtils; + Elements["/web/src/engine/element-wrappers"]; + Elements-->JSProc; + KeyboardStorage["/web/src/engine/keyboard-storage"]; + KeyboardStorage-->Interfaces; + DomUtils["/web/src/engine/dom-utils"]; + DomUtils-->WebUtils; + DomUtils-->KeyboardSpec; OSK-->DomUtils; - OSK---->IP; - Configuration[web/src/engine/paths]; - Configuration-->OSK; - CommonEngine[web/src/engine/main]; - CommonEngine-->Configuration; + OSK-->Gestures; + Interfaces["/web/src/engine/interfaces"]; + Interfaces-->KeyboardSpec; + OSK-->Interfaces; + CommonEngine["/web/src/engine/main"]; CommonEngine-->Device; - CommonEngine-->KeyboardCache; + CommonEngine-->KeyboardStorage; CommonEngine-->OSK; - Attachment[web/src/engine/attachment]; + Attachment["/web/src/engine/attachment"]; Attachment-->DomUtils; Attachment-->Elements; end - subgraph WebEngine["Keyman Engine for Web (top-level libraries)"] - Browser[web/src/app/browser]; - WebView[web/src/app/webview]; + subgraph WebEngine["`**WebEngine** + Keyman Engine for Web (top-level libraries)`"] + Browser["/web/src/app/browser"]; + WebView["/web/src/app/webview"]; WebView--->CommonEngine; Browser--->CommonEngine; Browser-->Attachment; end -``` \ No newline at end of file +``` diff --git a/web/build.sh b/web/build.sh index 179ac250dc..16d3d11235 100755 --- a/web/build.sh +++ b/web/build.sh @@ -27,10 +27,13 @@ builder_describe "Builds engine modules for Keyman Engine for Web (KMW)." \ ":engine/dom-utils A common subset of function used for DOM calculations, layout, etc" \ ":engine/events Specialized classes utilized to support KMW API events" \ ":engine/element-wrappers Subset used to integrate with website elements" \ + ":engine/interfaces Subset used to configure KMW" \ + ":engine/js-processor Build JS processor for KMW" \ + ":engine/keyboard Builds KMW's keyboard-loading and caching code" \ + ":engine/keyboard-storage Subset used to collate keyboards and request them from the cloud" \ ":engine/main Builds all common code used by KMW's app/-level targets" \ ":engine/osk Builds the Web OSK module" \ - ":engine/package-cache Subset used to collate keyboards and request them from the cloud" \ - ":engine/paths Subset used to configure KMW" \ + ":engine/predictive-text=src/engine/predictive-text/worker-main Builds KMW's predictive text module" \ ":samples Builds all needed resources for the KMW sample-page set" \ ":tools Builds engine-related development resources" \ ":test-pages=src/test/manual Builds resources needed for the KMW manual testing pages" \ @@ -57,10 +60,13 @@ builder_describe_outputs \ build:engine/dom-utils "/web/build/engine/dom-utils/obj/index.js" \ build:engine/events "/web/build/engine/events/lib/index.mjs" \ build:engine/element-wrappers "/web/build/engine/element-wrappers/lib/index.mjs" \ + build:engine/interfaces "/web/build/engine/interfaces/lib/index.mjs" \ + build:engine/js-processor "/web/build/engine/js-processor/lib/index.mjs" \ + build:engine/keyboard "/web/build/engine/keyboard/lib/index.mjs" \ + build:engine/keyboard-storage "/web/build/engine/keyboard-storage/lib/index.mjs" \ build:engine/main "/web/build/engine/main/lib/index.mjs" \ build:engine/osk "/web/build/engine/osk/lib/index.mjs" \ - build:engine/package-cache "/web/build/engine/package-cache/lib/index.mjs" \ - build:engine/paths "/web/build/engine/paths/lib/index.mjs" \ + build:engine/predictive-text "/web/src/engine/predictive-text/worker-main/build/lib/web/index.mjs" \ build:samples "/web/src/samples/simplest/keymanweb.js" \ build:tools "/web/build/tools/building/sourcemap-root/index.js" \ build:test-pages "/web/build/test-resources/sentry-manager.js" @@ -137,23 +143,23 @@ coverage_action() { builder_run_child_actions build:engine/device-detect builder_run_child_actions build:engine/dom-utils + +builder_run_child_actions build:engine/keyboard +builder_run_child_actions build:engine/js-processor builder_run_child_actions build:engine/element-wrappers builder_run_child_actions build:engine/events +builder_run_child_actions build:engine/interfaces -# Uses engine/dom-utils +# Uses engine/dom-utils and engine/interfaces builder_run_child_actions build:engine/osk # Uses engine/element-wrappers builder_run_child_actions build:engine/attachment -# Uses engine/osk (due to resource-path config interface) -builder_run_child_actions build:engine/paths +# Uses engine/interfaces (due to resource-path config interface) +builder_run_child_actions build:engine/keyboard-storage -# Uses engine/config (also due to resource-path config interface, but for the -# more complete version of that interface) -builder_run_child_actions build:engine/package-cache - -# Uses engine/paths, engine/device-detect, engine/package-cache, & engine/osk +# Uses engine/interfaces, engine/device-detect, engine/keyboard-storage, & engine/osk builder_run_child_actions build:engine/main # Uses all but engine/element-wrappers and engine/attachment diff --git a/web/ci.sh b/web/ci.sh index ecd7f23173..5e26a1e30e 100755 --- a/web/ci.sh +++ b/web/ci.sh @@ -85,8 +85,7 @@ if builder_start_action test; then # No --reporter option exists yet for the headless modules. - "$KEYMAN_ROOT/common/web/keyboard-processor/build.sh" test $OPTIONS - "$KEYMAN_ROOT/common/web/input-processor/build.sh" test $OPTIONS + "$KEYMAN_ROOT/web/src/engine/keyboard/build.sh" test $OPTIONS "$KEYMAN_ROOT/common/web/gesture-recognizer/test.sh" $OPTIONS ./build.sh test $OPTIONS @@ -220,4 +219,4 @@ if builder_start_action prepare:downloads.keyman.com; then cp -rf src/samples "$STATIC/src/samples" builder_finish_action success prepare:downloads.keyman.com -fi \ No newline at end of file +fi diff --git a/web/package.json b/web/package.json index 79ded888a4..96a11c0cd3 100644 --- a/web/package.json +++ b/web/package.json @@ -12,10 +12,10 @@ "types": "./build/engine/attachment/obj/index.d.ts", "import": "./build/engine/attachment/obj/index.js" }, - "./engine/paths": { - "es6-bundling": "./src/engine/paths/src/index.ts", - "types": "./build/engine/paths/obj/index.d.ts", - "import": "./build/engine/paths/obj/index.js" + "./engine/interfaces": { + "es6-bundling": "./src/engine/interfaces/src/index.ts", + "types": "./build/engine/interfaces/obj/index.d.ts", + "import": "./build/engine/interfaces/obj/index.js" }, "./engine/device-detect": { "es6-bundling": "./src/engine/device-detect/src/index.ts", @@ -37,21 +37,41 @@ "types": "./build/engine/events/obj/index.d.ts", "import": "./build/engine/events/obj/index.js" }, - "./engine/package-cache": { - "es6-bundling": "./src/engine/package-cache/src/index.ts", - "types": "./build/engine/package-cache/obj/index.d.ts", - "import": "./build/engine/package-cache/obj/index.js", - "require": "./build/engine/package-cache/obj/index.js" + "./engine/js-processor": { + "es6-bundling": "./src/engine/js-processor/src/index.ts", + "types": "./build/engine/js-processor/obj/index.d.ts", + "import": "./build/engine/js-processor/obj/index.js" }, - "./engine/package-cache/dom-requester": { - "es6-bundling": "./src/engine/package-cache/src/domCloudRequester.ts", - "types": "./build/engine/package-cache/obj/domCloudRequester.d.ts", - "import": "./build/engine/package-cache/obj/domCloudRequester.js" + "./engine/keyboard": { + "es6-bundling": "./src/engine/keyboard/src/index.ts", + "types": "./build/engine/keyboard/obj/index.d.ts", + "import": "./build/engine/keyboard/obj/index.js" }, - "./engine/package-cache/node-requester": { - "es6-bundling": "./src/engine/package-cache/src/nodeCloudRequester.ts", - "types": "./build/engine/package-cache/obj/nodeCloudRequester.d.ts", - "import": "./build/engine/package-cache/obj/nodeCloudRequester.js" + "./engine/keyboard/node-keyboard-loader": { + "es6-bundling": "./src/engine/keyboard/src/keyboards/loaders/node-keyboard-loader.ts", + "types": "./build/engine/keyboard/obj/keyboards/loaders/node-keyboard-loader.d.ts", + "import": "./build/engine/keyboard/obj/keyboards/loaders/node-keyboard-loader.js" + }, + "./engine/keyboard/dom-keyboard-loader": { + "es6-bundling": "./src/engine/keyboard/src/keyboards/loaders/dom-keyboard-loader.ts", + "types": "./build/engine/keyboard/obj/keyboards/loaders/dom-keyboard-loader.d.ts", + "import": "./build/engine/keyboard/obj/keyboards/loaders/dom-keyboard-loader.js" + }, + "./engine/keyboard-storage": { + "es6-bundling": "./src/engine/keyboard-storage/src/index.ts", + "types": "./build/engine/keyboard-storage/obj/index.d.ts", + "import": "./build/engine/keyboard-storage/obj/index.js", + "require": "./build/engine/keyboard-storage/obj/index.js" + }, + "./engine/keyboard-storage/dom-requester": { + "es6-bundling": "./src/engine/keyboard-storage/src/domCloudRequester.ts", + "types": "./build/engine/keyboard-storage/obj/domCloudRequester.d.ts", + "import": "./build/engine/keyboard-storage/obj/domCloudRequester.js" + }, + "./engine/keyboard-storage/node-requester": { + "es6-bundling": "./src/engine/keyboard-storage/src/nodeCloudRequester.ts", + "types": "./build/engine/keyboard-storage/obj/nodeCloudRequester.d.ts", + "import": "./build/engine/keyboard-storage/obj/nodeCloudRequester.js" }, "./engine/main": { "es6-bundling": "./src/engine/main/src/index.ts", @@ -99,8 +119,6 @@ "test": "gosh ./test.sh" }, "dependencies": { - "@keymanapp/input-processor": "*", - "@keymanapp/keyboard-processor": "*", "@keymanapp/keyman-version": "*", "@keymanapp/lexical-model-layer": "*", "@keymanapp/models-types": "*", diff --git a/web/src/app/browser/build.sh b/web/src/app/browser/build.sh index 049bc056b5..1d757e264a 100755 --- a/web/src/app/browser/build.sh +++ b/web/src/app/browser/build.sh @@ -79,7 +79,7 @@ compile_and_copy() { local PROFILE_DEST="$KEYMAN_ROOT/web/build/profiling/" mkdir -p "$PROFILE_DEST" cp "${BUILD_ROOT}/filesize-profile.log" "$PROFILE_DEST/web-engine-filesize.log" - cp "$KEYMAN_ROOT/common/web/lm-worker/build/filesize-profile.log" "$PROFILE_DEST/lm-worker-filesize.log" + cp "$KEYMAN_ROOT/web/src/engine/predictive-text/worker-thread/build/filesize-profile.log" "$PROFILE_DEST/lm-worker-filesize.log" } builder_run_action configure verify_npm_setup diff --git a/web/src/app/browser/src/beepHandler.ts b/web/src/app/browser/src/beepHandler.ts index 3659f8d7fd..eb6d6583ee 100644 --- a/web/src/app/browser/src/beepHandler.ts +++ b/web/src/app/browser/src/beepHandler.ts @@ -1,4 +1,4 @@ -import { type KeyboardInterface } from '@keymanapp/keyboard-processor'; +import { type KeyboardInterface } from 'keyman/engine/js-processor'; import { DesignIFrame, OutputTarget } from 'keyman/engine/element-wrappers'; // Utility object used to handle beep (keyboard error response) operations. diff --git a/web/src/app/browser/src/configuration.ts b/web/src/app/browser/src/configuration.ts index 07be8264e7..df2153df82 100644 --- a/web/src/app/browser/src/configuration.ts +++ b/web/src/app/browser/src/configuration.ts @@ -1,7 +1,7 @@ import { EngineConfiguration, InitOptionSpec, InitOptionDefaults } from "keyman/engine/main"; import { OutputTarget as DOMOutputTarget } from 'keyman/engine/element-wrappers'; -import { isEmptyTransform, OutputTarget, RuleBehavior } from '@keymanapp/keyboard-processor'; +import { isEmptyTransform, OutputTarget, RuleBehavior } from 'keyman/engine/js-processor'; import { AlertHost } from "./utils/alertHost.js"; import { whenDocumentReady } from "./utils/documentReady.js"; diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts index 1511269bbe..1fbc905203 100644 --- a/web/src/app/browser/src/contextManager.ts +++ b/web/src/app/browser/src/contextManager.ts @@ -1,5 +1,5 @@ -import { type Keyboard, KeyboardScriptError } from '@keymanapp/keyboard-processor'; -import { type KeyboardStub } from 'keyman/engine/package-cache'; +import { type Keyboard, KeyboardScriptError } from 'keyman/engine/keyboard'; +import { type KeyboardStub } from 'keyman/engine/keyboard-storage'; import { CookieSerializer } from 'keyman/engine/dom-utils'; import { eventOutputTarget, outputTargetForElement, PageContextAttachment } from 'keyman/engine/attachment'; import { DomEventTracker, LegacyEventEmitter } from 'keyman/engine/events'; diff --git a/web/src/app/browser/src/defaultBrowserRules.ts b/web/src/app/browser/src/defaultBrowserRules.ts index cbd70fc8c7..4f0ffbe012 100644 --- a/web/src/app/browser/src/defaultBrowserRules.ts +++ b/web/src/app/browser/src/defaultBrowserRules.ts @@ -1,9 +1,10 @@ +import { ModifierKeyConstants } from '@keymanapp/common-types'; import { Codes, DefaultRules, - type KeyEvent, - type OutputTarget -} from '@keymanapp/keyboard-processor'; + type KeyEvent +} from 'keyman/engine/keyboard'; +import { type OutputTarget } from 'keyman/engine/js-processor'; import ContextManager from './contextManager.js'; @@ -45,7 +46,7 @@ export default class DefaultBrowserRules extends DefaultRules { // This method will be handled between `ContextManager` and PageContextAttachment: // pageContextAttachment.findNeighboringInput(contextManager.activeTarget.getElement(), ) case Codes.keyCodes['K_TAB']: - moveToNext((Lkc.Lmodifiers & Codes.modifierCodes['SHIFT']) != 0); + moveToNext((Lkc.Lmodifiers & ModifierKeyConstants.K_SHIFTFLAG) != 0); break; case Codes.keyCodes['K_TABBACK']: moveToNext(true); diff --git a/web/src/app/browser/src/hardwareEventKeyboard.ts b/web/src/app/browser/src/hardwareEventKeyboard.ts index 84fa62ed61..0bb594e897 100644 --- a/web/src/app/browser/src/hardwareEventKeyboard.ts +++ b/web/src/app/browser/src/hardwareEventKeyboard.ts @@ -1,4 +1,6 @@ -import { Codes, DeviceSpec, KeyEvent, KeyMapping, Keyboard, KeyboardProcessor } from '@keymanapp/keyboard-processor'; +import { Codes, DeviceSpec, KeyEvent, KeyMapping, Keyboard } from 'keyman/engine/keyboard'; +import { KeyboardProcessor } from 'keyman/engine/js-processor'; +import { ModifierKeyConstants } from '@keymanapp/common-types'; import { HardKeyboard, processForMnemonicsAndLegacy } from 'keyman/engine/main'; import { DomEventTracker } from 'keyman/engine/events'; @@ -96,25 +98,24 @@ export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: Keyboar curModState |= (e.getModifierState("Shift") ? 0x10 : 0); - let modifierCodes = Codes.modifierCodes; if(e.getModifierState("Control")) { curModState |= ((e.location != 0 && ctrlEvent) ? - (e.location == 1 ? modifierCodes['LCTRL'] : modifierCodes['RCTRL']) : // Condition 1 + (e.location == 1 ? ModifierKeyConstants.LCTRLFLAG : ModifierKeyConstants.RCTRLFLAG) : // Condition 1 prevModState & 0x0003); // Condition 2 } if(e.getModifierState("Alt")) { curModState |= ((e.location != 0 && altEvent) ? - (e.location == 1 ? modifierCodes['LALT'] : modifierCodes['RALT']) : // Condition 1 + (e.location == 1 ? ModifierKeyConstants.LALTFLAG : ModifierKeyConstants.RALTFLAG) : // Condition 1 prevModState & 0x000C); // Condition 2 } // Stage 2 - detect state key information. It can be looked up per keypress with no issue. let Lstates = 0; - Lstates |= e.getModifierState('CapsLock') ? modifierCodes['CAPS'] : modifierCodes['NO_CAPS']; - Lstates |= e.getModifierState('NumLock') ? modifierCodes['NUM_LOCK'] : modifierCodes['NO_NUM_LOCK']; + Lstates |= e.getModifierState('CapsLock') ? ModifierKeyConstants.CAPITALFLAG : ModifierKeyConstants.NOTCAPITALFLAG; + Lstates |= e.getModifierState('NumLock') ? ModifierKeyConstants.NUMLOCKFLAG : ModifierKeyConstants.NOTNUMLOCKFLAG; Lstates |= (e.getModifierState('ScrollLock')) - ? modifierCodes['SCROLL_LOCK'] : modifierCodes['NO_SCROLL_LOCK']; + ? ModifierKeyConstants.SCROLLFLAG : ModifierKeyConstants.NOTSCROLLFLAG; // We need these states to be tracked as well for proper OSK updates. curModState |= Lstates; @@ -128,14 +129,14 @@ export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: Keyboar keyboardState.modStateFlags = curModState; // For European keyboards, not all browsers properly send both key-up events for the AltGr combo. - let altGrMask = modifierCodes['RALT'] | modifierCodes['LCTRL']; + let altGrMask = ModifierKeyConstants.RALTFLAG | ModifierKeyConstants.LCTRLFLAG; if((prevModState & altGrMask) == altGrMask && (curModState & altGrMask) != altGrMask) { // We just released AltGr - make sure it's all released. curModState &= ~ altGrMask; } // Perform basic filtering for Windows-based ALT_GR emulation on European keyboards. - if(curModState & modifierCodes['RALT']) { - curModState &= ~modifierCodes['LCTRL']; + if(curModState & ModifierKeyConstants.RALTFLAG) { + curModState &= ~ModifierKeyConstants.LCTRLFLAG; } let modifierBitmasks = Codes.modifierBitmasks; @@ -148,14 +149,14 @@ export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: Keyboar // Note for future - embedding a kill switch here would facilitate disabling AltGr / Right-alt simulation. if(activeKeyboard.emulatesAltGr && (Lmodifiers & modifierBitmasks['ALT_GR_SIM']) == modifierBitmasks['ALT_GR_SIM']) { Lmodifiers ^= modifierBitmasks['ALT_GR_SIM']; - Lmodifiers |= modifierCodes['RALT']; + Lmodifiers |= ModifierKeyConstants.RALTFLAG; } } else { // No need to sim AltGr here; we don't need chiral ALTs. Lmodifiers = (curModState & 0x10) | // SHIFT - ((curModState & (modifierCodes['LCTRL'] | modifierCodes['RCTRL'])) ? 0x20 : 0) | - ((curModState & (modifierCodes['LALT'] | modifierCodes['RALT'])) ? 0x40 : 0); + ((curModState & (ModifierKeyConstants.LCTRLFLAG | ModifierKeyConstants.RCTRLFLAG)) ? 0x20 : 0) | + ((curModState & (ModifierKeyConstants.LALTFLAG | ModifierKeyConstants.RALTFLAG)) ? 0x40 : 0); } @@ -164,7 +165,7 @@ export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: Keyboar * because some keyboards specify their own modifierBitmask, which won't include it. * We don't currently use that reference in this method, but that may change in the future. */ - Lmodifiers |= (e.metaKey ? modifierCodes['META']: 0); + Lmodifiers |= (e.metaKey ? ModifierKeyConstants.K_METAFLAG: 0); // Physically-typed keys require use of a 'desktop' form factor and thus are based on a virtual "physical" Device. diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts index d807c415eb..324394bae2 100644 --- a/web/src/app/browser/src/keymanEngine.ts +++ b/web/src/app/browser/src/keymanEngine.ts @@ -6,8 +6,8 @@ import { TwoStateActivator, VisualKeyboard } from 'keyman/engine/osk'; -import { ErrorStub, KeyboardStub, CloudQueryResult, toPrefixedKeyboardId as prefixed } from 'keyman/engine/package-cache'; -import { DeviceSpec, Keyboard, KeyboardObject } from "@keymanapp/keyboard-processor"; +import { ErrorStub, KeyboardStub, CloudQueryResult, toPrefixedKeyboardId as prefixed } from 'keyman/engine/keyboard-storage'; +import { DeviceSpec, Keyboard, KeyboardObject } from "keyman/engine/keyboard"; import * as views from './viewsAnchorpoint.js'; import { BrowserConfiguration, BrowserInitOptionDefaults, BrowserInitOptionSpec } from './configuration.js'; diff --git a/web/src/app/browser/src/languageMenu.ts b/web/src/app/browser/src/languageMenu.ts index eb9361ccba..d3144de6e5 100644 --- a/web/src/app/browser/src/languageMenu.ts +++ b/web/src/app/browser/src/languageMenu.ts @@ -1,6 +1,6 @@ // Manages the language selection UI for touch-form factors, which is triggered by an OSK key. import { getAbsoluteX, landscapeView } from "keyman/engine/dom-utils"; -import { KeyboardStub } from "keyman/engine/package-cache"; +import { KeyboardStub } from "keyman/engine/keyboard-storage"; import KeymanEngine from "./keymanEngine.js"; import * as util from "./utils/index.js"; diff --git a/web/src/app/browser/src/utilApiEndpoint.ts b/web/src/app/browser/src/utilApiEndpoint.ts index 3b3aa28f2b..d91c67efb6 100644 --- a/web/src/app/browser/src/utilApiEndpoint.ts +++ b/web/src/app/browser/src/utilApiEndpoint.ts @@ -10,7 +10,7 @@ import { DomEventTracker } from "keyman/engine/events"; import { BrowserConfiguration, BrowserInitOptionSpec } from "./configuration.js"; import { getStyleValue } from "./utils/getStyleValue.js"; import { AlertHost } from "./utils/alertHost.js"; -import { PathConfiguration } from 'keyman/engine/paths'; +import { PathConfiguration } from 'keyman/engine/interfaces'; /** * Calls document.createElement for the specified node type and also applies diff --git a/web/src/app/webview/src/contextManager.ts b/web/src/app/webview/src/contextManager.ts index b0c322ea29..b0b90b4d96 100644 --- a/web/src/app/webview/src/contextManager.ts +++ b/web/src/app/webview/src/contextManager.ts @@ -1,5 +1,6 @@ -import { type Keyboard, Mock, OutputTarget, Transcription, findCommonSubstringEndIndex, isEmptyTransform, TextTransform } from '@keymanapp/keyboard-processor'; -import { KeyboardStub } from 'keyman/engine/package-cache'; +import { type Keyboard } from 'keyman/engine/keyboard'; +import { Mock, OutputTarget, Transcription, findCommonSubstringEndIndex, isEmptyTransform, TextTransform } from 'keyman/engine/js-processor'; +import { KeyboardStub } from 'keyman/engine/keyboard-storage'; import { ContextManagerBase } from 'keyman/engine/main'; import { WebviewConfiguration } from './configuration.js'; diff --git a/web/src/app/webview/src/keymanEngine.ts b/web/src/app/webview/src/keymanEngine.ts index ba98f8c477..d390a6ce1b 100644 --- a/web/src/app/webview/src/keymanEngine.ts +++ b/web/src/app/webview/src/keymanEngine.ts @@ -1,8 +1,9 @@ -import { DefaultRules, DeviceSpec, RuleBehavior } from '@keymanapp/keyboard-processor' +import { DeviceSpec, DefaultRules } from 'keyman/engine/keyboard'; +import { RuleBehavior } from 'keyman/engine/js-processor'; import { KeymanEngine as KeymanEngineBase, KeyboardInterface } from 'keyman/engine/main'; import { AnchoredOSKView, ViewConfiguration, StaticActivator } from 'keyman/engine/osk'; import { getAbsoluteX, getAbsoluteY } from 'keyman/engine/dom-utils'; -import { toPrefixedKeyboardId, toUnprefixedKeyboardId } from 'keyman/engine/package-cache'; +import { toPrefixedKeyboardId, toUnprefixedKeyboardId } from 'keyman/engine/keyboard-storage'; import { WebviewConfiguration, WebviewInitOptionDefaults, WebviewInitOptionSpec } from './configuration.js'; import ContextManager, { ContextHost } from './contextManager.js'; diff --git a/web/src/app/webview/src/oskConfiguration.ts b/web/src/app/webview/src/oskConfiguration.ts index 26ceeb2872..9250b5a2a1 100644 --- a/web/src/app/webview/src/oskConfiguration.ts +++ b/web/src/app/webview/src/oskConfiguration.ts @@ -1,5 +1,5 @@ import { OSKView } from "keyman/engine/osk"; -import { DeviceSpec } from "@keymanapp/keyboard-processor"; +import { DeviceSpec } from "keyman/engine/keyboard"; import { type EmbeddedGestureConfig } from "keyman/engine/osk"; import { GlobeHint } from './osk/globeHint.js'; diff --git a/web/src/app/webview/src/passthroughKeyboard.ts b/web/src/app/webview/src/passthroughKeyboard.ts index d74ab7f99a..25dec7a8e6 100644 --- a/web/src/app/webview/src/passthroughKeyboard.ts +++ b/web/src/app/webview/src/passthroughKeyboard.ts @@ -1,4 +1,4 @@ -import { DeviceSpec, Keyboard, KeyEvent, ManagedPromise } from '@keymanapp/keyboard-processor'; +import { DeviceSpec, Keyboard, KeyEvent, ManagedPromise } from 'keyman/engine/keyboard'; import { HardKeyboard, processForMnemonicsAndLegacy } from 'keyman/engine/main'; diff --git a/web/src/engine/attachment/src/pageContextAttachment.ts b/web/src/engine/attachment/src/pageContextAttachment.ts index d63c113d5e..4325c88f15 100644 --- a/web/src/engine/attachment/src/pageContextAttachment.ts +++ b/web/src/engine/attachment/src/pageContextAttachment.ts @@ -1,6 +1,6 @@ import { EventEmitter } from 'eventemitter3'; -import { DeviceSpec, InternalKeyboardFont } from "@keymanapp/keyboard-processor"; +import { DeviceSpec, InternalKeyboardFont } from "keyman/engine/keyboard"; import { Input, nestedInstanceOf, wrapElement } from "keyman/engine/element-wrappers"; import { arrayFromNodeList, diff --git a/web/src/engine/dom-utils/build.sh b/web/src/engine/dom-utils/build.sh index 74b46051c4..d2e424db20 100755 --- a/web/src/engine/dom-utils/build.sh +++ b/web/src/engine/dom-utils/build.sh @@ -16,7 +16,7 @@ SUBPROJECT_NAME=engine/dom-utils builder_describe "Builds DOM-utility modules used by the Keyman Engine for Web (KMW)." \ "@/common/web/utils" \ - "@/common/web/keyboard-processor" \ + "@/web/src/engine/keyboard" \ "clean" \ "configure" \ "build" \ diff --git a/web/src/engine/dom-utils/src/stylesheets.ts b/web/src/engine/dom-utils/src/stylesheets.ts index 7312a62f05..977f253ff7 100644 --- a/web/src/engine/dom-utils/src/stylesheets.ts +++ b/web/src/engine/dom-utils/src/stylesheets.ts @@ -1,5 +1,5 @@ import { DeviceSpec, ManagedPromise } from '@keymanapp/web-utils'; -import { type InternalKeyboardFont as KeyboardFont } from '@keymanapp/keyboard-processor'; +import { type InternalKeyboardFont as KeyboardFont } from 'keyman/engine/keyboard'; type FontFamilyStyleMap = {[family: string]: HTMLStyleElement}; diff --git a/web/src/engine/dom-utils/tsconfig.json b/web/src/engine/dom-utils/tsconfig.json index c0b4a7d79d..dadf4db5c8 100644 --- a/web/src/engine/dom-utils/tsconfig.json +++ b/web/src/engine/dom-utils/tsconfig.json @@ -11,7 +11,7 @@ "include": [ "src/**/*.ts" ], "references": [ - { "path": "../../../../common/web/keyboard-processor" }, + { "path": "../keyboard" }, { "path": "../../../../common/web/utils" } ] } diff --git a/web/src/engine/element-wrappers/build.sh b/web/src/engine/element-wrappers/build.sh index cfcc58a44f..e188c7dd41 100755 --- a/web/src/engine/element-wrappers/build.sh +++ b/web/src/engine/element-wrappers/build.sh @@ -13,7 +13,7 @@ SUBPROJECT_NAME=engine/element-wrappers # ################################ Main script ################################ builder_describe "Builds DOM-based OutputTarget subclasses used by the Keyman Engine for Web (KMW)." \ - "@/common/web/keyboard-processor" \ + "@/web/src/engine/js-processor" \ "clean" \ "configure" \ "build" \ diff --git a/web/src/engine/element-wrappers/readme.md b/web/src/engine/element-wrappers/readme.md index 1237237c7b..2a7685edbc 100644 --- a/web/src/engine/element-wrappers/readme.md +++ b/web/src/engine/element-wrappers/readme.md @@ -1,4 +1,4 @@ ## engine/element-wrappers This submodule provides a subset of the main engine's Web-oriented code that's used to 'wrap' webpage -elements as part of KMW attachment and interface the element with the `keyboard-processor` submodule. \ No newline at end of file +elements as part of KMW attachment and interface the element with the `keyboard` submodule. \ No newline at end of file diff --git a/web/src/engine/element-wrappers/src/outputTarget.ts b/web/src/engine/element-wrappers/src/outputTarget.ts index 3a288c1347..43623af781 100644 --- a/web/src/engine/element-wrappers/src/outputTarget.ts +++ b/web/src/engine/element-wrappers/src/outputTarget.ts @@ -1,4 +1,4 @@ -import { OutputTarget as OutputTargetBase } from "@keymanapp/keyboard-processor"; +import { OutputTarget as OutputTargetBase } from "keyman/engine/js-processor"; import { EventEmitter } from 'eventemitter3'; export default abstract class OutputTarget extends OutputTargetBase { diff --git a/web/src/engine/element-wrappers/tsconfig.json b/web/src/engine/element-wrappers/tsconfig.json index ab6aa238a8..15a58bbf2a 100644 --- a/web/src/engine/element-wrappers/tsconfig.json +++ b/web/src/engine/element-wrappers/tsconfig.json @@ -11,6 +11,6 @@ "include": [ "src/**/*.ts" ], "references": [ - { "path": "../../../../common/web/keyboard-processor" } + { "path": "../keyboard" } ] } diff --git a/web/src/engine/events/build.sh b/web/src/engine/events/build.sh index 438d075c2c..1b8993f570 100755 --- a/web/src/engine/events/build.sh +++ b/web/src/engine/events/build.sh @@ -14,7 +14,7 @@ SUBPROJECT_NAME=engine/events builder_describe "Builds specialized event-related modules utilized by Keyman Engine for Web." \ "@/common/web/utils build" \ - "@/common/web/keyboard-processor build" \ + "@/web/src/engine/keyboard build" \ "clean" \ "configure" \ "build" \ diff --git a/web/src/engine/events/src/index.ts b/web/src/engine/events/src/index.ts index 2d95307bc9..ee5674b66c 100644 --- a/web/src/engine/events/src/index.ts +++ b/web/src/engine/events/src/index.ts @@ -1,4 +1,3 @@ export { DomEventTracker } from './domEventTracker.js'; export { EmitterListenerSpy } from './emitterListenerSpy.js'; -export * from './keyEventSource.interface.js'; export * from './legacyEventEmitter.js'; \ No newline at end of file diff --git a/web/src/engine/events/tsconfig.json b/web/src/engine/events/tsconfig.json index bb25ac9c99..5d0a45bbab 100644 --- a/web/src/engine/events/tsconfig.json +++ b/web/src/engine/events/tsconfig.json @@ -12,6 +12,6 @@ "references": [ { "path": "../../../../common/web/utils" }, - { "path": "../../../../common/web/keyboard-processor" } + { "path": "../keyboard" } ] } diff --git a/web/src/engine/paths/.c8rc.json b/web/src/engine/interfaces/.c8rc.json similarity index 69% rename from web/src/engine/paths/.c8rc.json rename to web/src/engine/interfaces/.c8rc.json index c789716cd5..c42b096f68 100644 --- a/web/src/engine/paths/.c8rc.json +++ b/web/src/engine/interfaces/.c8rc.json @@ -3,7 +3,7 @@ "clean": true, "exclude-after-remap": true, "reporter": ["text", "text-summary"], - "reports-dir": "build/coverage", + "reports-dir": "../../../build/engine/interfaces/coverage", "src": [ "src/" ] diff --git a/web/src/engine/paths/build.sh b/web/src/engine/interfaces/build.sh similarity index 93% rename from web/src/engine/paths/build.sh rename to web/src/engine/interfaces/build.sh index 05a669aa0b..568bd7940d 100755 --- a/web/src/engine/paths/build.sh +++ b/web/src/engine/interfaces/build.sh @@ -6,7 +6,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" . "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE -SUBPROJECT_NAME=engine/paths +SUBPROJECT_NAME=engine/interfaces . "$KEYMAN_ROOT/web/common.inc.sh" . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" @@ -14,7 +14,8 @@ SUBPROJECT_NAME=engine/paths builder_describe "Builds configuration subclasses used by the Keyman Engine for Web (KMW)." \ "@/common/web/es-bundling" \ - "@/web/src/engine/osk build" \ + "@/web/src/engine/keyboard" \ + "@/web/src/engine/js-processor" \ "clean" \ "configure" \ "build" \ diff --git a/web/src/engine/interfaces/src/index.ts b/web/src/engine/interfaces/src/index.ts new file mode 100644 index 0000000000..fb22d0c6d9 --- /dev/null +++ b/web/src/engine/interfaces/src/index.ts @@ -0,0 +1,6 @@ +export { default as PathConfiguration } from './pathConfiguration.js'; +export { PathOptionDefaults, PathOptionSpec } from './optionSpec.interface.js'; +export { ModelSpec } from './modelSpec.js'; +export { default as PredictionContext } from './prediction/predictionContext.js'; +export { LanguageProcessorEventMap, StateChangeEnum, ReadySuggestions } from './prediction/languageProcessor.interface.js'; +export { OSKResourcePathConfiguration } from './oskResourcePathConfiguration.interface.js'; \ No newline at end of file diff --git a/common/web/input-processor/src/text/prediction/modelSpec.ts b/web/src/engine/interfaces/src/modelSpec.ts similarity index 94% rename from common/web/input-processor/src/text/prediction/modelSpec.ts rename to web/src/engine/interfaces/src/modelSpec.ts index 986d946311..79b2ad0aa4 100644 --- a/common/web/input-processor/src/text/prediction/modelSpec.ts +++ b/web/src/engine/interfaces/src/modelSpec.ts @@ -2,7 +2,7 @@ * Defines the metadata needed to support and load lexical models compatible with * Keyman Engine for Web. */ -export default interface ModelSpec { +export interface ModelSpec { /** * The model's unique identifier. */ diff --git a/web/src/engine/paths/src/optionSpec.interface.ts b/web/src/engine/interfaces/src/optionSpec.interface.ts similarity index 100% rename from web/src/engine/paths/src/optionSpec.interface.ts rename to web/src/engine/interfaces/src/optionSpec.interface.ts diff --git a/web/src/engine/osk/src/config/oskResourcePathConfiguration.interface.ts b/web/src/engine/interfaces/src/oskResourcePathConfiguration.interface.ts similarity index 60% rename from web/src/engine/osk/src/config/oskResourcePathConfiguration.interface.ts rename to web/src/engine/interfaces/src/oskResourcePathConfiguration.interface.ts index 9f5d7753ed..78e5032cba 100644 --- a/web/src/engine/osk/src/config/oskResourcePathConfiguration.interface.ts +++ b/web/src/engine/interfaces/src/oskResourcePathConfiguration.interface.ts @@ -1,5 +1,5 @@ // Used by the OSK module. -export default interface OSKResourcePathConfiguration { +export interface OSKResourcePathConfiguration { readonly fonts: string, readonly resources: string } diff --git a/web/src/engine/paths/src/pathConfiguration.ts b/web/src/engine/interfaces/src/pathConfiguration.ts similarity index 97% rename from web/src/engine/paths/src/pathConfiguration.ts rename to web/src/engine/interfaces/src/pathConfiguration.ts index 47d8010702..0eff8f65f7 100644 --- a/web/src/engine/paths/src/pathConfiguration.ts +++ b/web/src/engine/interfaces/src/pathConfiguration.ts @@ -1,5 +1,5 @@ import { PathOptionSpec } from "./optionSpec.interface.js"; -import { OSKResourcePathConfiguration } from 'keyman/engine/osk'; +import { OSKResourcePathConfiguration } from './oskResourcePathConfiguration.interface.js'; const addDelimiter = (p: string) => { // Add delimiter if missing diff --git a/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts b/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts new file mode 100644 index 0000000000..84e7851987 --- /dev/null +++ b/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts @@ -0,0 +1,75 @@ +/// + +import { EventEmitter } from "eventemitter3"; +import { OutputTarget } from "keyman/engine/keyboard"; + +export class ReadySuggestions { + suggestions: Suggestion[]; + transcriptionID: number; + + constructor(suggestions: Suggestion[], id: number) { + this.suggestions = suggestions; + this.transcriptionID = id; + } +} + +/** + * Corresponds to the 'suggestionsready' LanguageProcessor event. + */ +export type ReadySuggestionsHandler = (prediction: ReadySuggestions) => boolean; + +export type InvalidateSourceEnum = 'new' | 'context'; + +/** + * Corresponds to the 'invalidatesuggestions' LanguageProcessor event. + */ +export type InvalidateSuggestionsHandler = (source: InvalidateSourceEnum) => boolean; + +export type StateChangeEnum = 'active' | 'configured' | 'inactive'; +/** + * Corresponds to the 'statechange' LanguageProcessor event. + */ +export type StateChangeHandler = (state: StateChangeEnum) => any; + +/** + * Covers 'tryaccept' events. + */ +export type TryUIHandler = (source: string, returnObj: { shouldSwallow: boolean }) => boolean; + +export interface LanguageProcessorEventMap { + 'suggestionsready': ReadySuggestionsHandler, + 'invalidatesuggestions': InvalidateSuggestionsHandler, + 'statechange': StateChangeHandler, + 'tryaccept': TryUIHandler, + 'tryrevert': () => void, + + /** + * Is called synchronously once suggestion application is successful and the context has been updated. + * + * @param outputTarget The `OutputTarget` representation of the context the suggestion was applied to. + * @returns + */ + 'suggestionapplied': (outputTarget: OutputTarget) => boolean +} + + +export interface LanguageProcessorSpec extends EventEmitter { + + get state(): StateChangeEnum; + + invalidateContext(outputTarget: OutputTarget, layerId: string): Promise; + + /** + * + * @param suggestion + * @param outputTarget + * @param getLayerId a function that returns the current layerId, + * required because layerid can be changed by PostKeystroke + * @returns + */ + applySuggestion(suggestion: Suggestion, outputTarget: OutputTarget, getLayerId: () => string): Promise; + + applyReversion(reversion: Reversion, outputTarget: OutputTarget): Promise; + + get wordbreaksAfterSuggestions(): boolean; +} diff --git a/common/web/input-processor/src/text/prediction/predictionContext.ts b/web/src/engine/interfaces/src/prediction/predictionContext.ts similarity index 87% rename from common/web/input-processor/src/text/prediction/predictionContext.ts rename to web/src/engine/interfaces/src/prediction/predictionContext.ts index f962b3f3ec..cd856153b2 100644 --- a/common/web/input-processor/src/text/prediction/predictionContext.ts +++ b/web/src/engine/interfaces/src/prediction/predictionContext.ts @@ -1,7 +1,6 @@ import { EventEmitter } from "eventemitter3"; -import type LanguageProcessor from "./languageProcessor.js"; -import { ReadySuggestions, type InvalidateSourceEnum, StateChangeHandler } from './languageProcessor.js'; -import { type KeyboardProcessor, type OutputTarget } from "@keymanapp/keyboard-processor"; +import { type LanguageProcessorSpec , ReadySuggestions, type InvalidateSourceEnum, StateChangeHandler } from './languageProcessor.interface.js'; +import { type OutputTarget } from "keyman/engine/keyboard"; interface PredictionContextEventMap { update: (suggestions: Suggestion[]) => void; @@ -32,8 +31,8 @@ export default class PredictionContext extends EventEmitter string; /** * Represents the active context used when requesting and applying predictive-text operations. @@ -60,27 +59,18 @@ export default class PredictionContext extends EventEmitter Promise; private readonly suggestionReverter: (reversion: Reversion) => void; - /** - * Handler for post-processing once a suggestion has been applied: calls - * into the active keyboard's `begin postKeystroke` entry point. - * - * Called after the suggestion is applied but _before_ new predictions are - * requested based on the resulting context. - */ - private readonly postApplicationHandler: () => void; - - public constructor(langProcessor: LanguageProcessor, kbdProcessor: KeyboardProcessor) { + public constructor(langProcessor: LanguageProcessorSpec, getLayerId: () => string) { super(); this.langProcessor = langProcessor; - this.kbdProcessor = kbdProcessor; + this.getLayerId = getLayerId; const validSuggestionState: () => boolean = () => this.currentTarget && langProcessor.state == 'configured'; this.suggestionApplier = (suggestion) => { if(validSuggestionState()) { - return langProcessor.applySuggestion(suggestion, this.currentTarget, () => kbdProcessor.layerId); + return langProcessor.applySuggestion(suggestion, this.currentTarget, getLayerId); } else { return null; } @@ -95,19 +85,6 @@ export default class PredictionContext extends EventEmitter { - // Tell the keyboard that the current layer has not changed - kbdProcessor.newLayerStore.set(''); - kbdProcessor.oldLayerStore.set(''); - // Call the keyboard's entry point. - kbdProcessor.processPostKeystroke(kbdProcessor.contextDevice, this.currentTarget) - // If we have a RuleBehavior as a result, run it on the target. This should - // only change system store and variable store values. - ?.finalize(kbdProcessor, this.currentTarget, true); - }; - this.connect(); } @@ -117,8 +94,6 @@ export default class PredictionContext extends EventEmitter