YScript v2.2.1 - bug fixes

fixed major bug that prevented yscript from being assigned to globalThis
ProdigyPXP · Oct 3, 2024 · d4cdc8d · d4cdc8d
1 parent a641a21
commit d4cdc8d
Show file tree

Hide file tree

Showing 17 changed files with 55 additions and 38 deletions.
diff --git a/dist/yscipt-es2016.min.js b/dist/yscipt-es2016.min.js
diff --git a/dist/yscipt-es2017.min.js b/dist/yscipt-es2017.min.js
diff --git a/dist/yscipt-es2018.min.js b/dist/yscipt-es2018.min.js
diff --git a/dist/yscipt-es2019.min.js b/dist/yscipt-es2019.min.js
diff --git a/dist/yscipt-es2020.min.js b/dist/yscipt-es2020.min.js
diff --git a/dist/yscipt-es2021.min.js b/dist/yscipt-es2021.min.js
diff --git a/dist/yscipt-es2022.min.js b/dist/yscipt-es2022.min.js
diff --git a/dist/yscript-esnext.min.js b/dist/yscript-esnext.min.js
diff --git a/dist/yscript.dev.js b/dist/yscript.dev.js
diff --git a/dist/yscript.dev.js.map b/dist/yscript.dev.js.map
diff --git a/dist/yscript.min.js b/dist/yscript.min.js
diff --git a/esbuild.mjs b/esbuild.mjs
@@ -23,8 +23,9 @@ let build = true;
 
 const banner = {
   js: `/* YScript v${version} (${distro}) | Copyright (c) 2016-${new Date().getFullYear()} ProdigyPXP, Yopta.Space project, and Contributors | Licensed under the MIT license */` + 
-    `global["yscript"]=Object.create(null);` + 
-    `global["yscript"]["distro"]="${distro}";`,
+    `globalThis["yscript"]=Object.create(null);` + 
+    `globalThis["yscript"]["distro"]="${distro}";` +
+    `globalThis["yscript"]["version"]="${version}";`,
   css: ""
 };
 const bundle = true;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@ppxp/yopta",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "description": "YSCript - язык программирования для гопников и реальных пацанов.",
     "main": "dist/yscript.min.js",
     "scripts": {
@@ -29,14 +29,14 @@
     },
     "homepage": "https://github.com/ProdigyPXP/YScript",
     "devDependencies": {
-        "@types/jest": "^29.5.1",
-        "@types/node": "^18.16.3",
-        "esbuild": "^0.17.18",
-        "jest": "^29.5.0",
-        "jest-environment-jsdom": "^29.5.0",
-        "serve": "^14.2.0",
-        "ts-node": "^10.9.1",
-        "typescript": "^5.0.4"
+        "@types/jest": "^29.5.13",
+        "@types/node": "^18.19.54",
+        "esbuild": "^0.17.19",
+        "jest": "^29.7.0",
+        "jest-environment-jsdom": "^29.7.0",
+        "serve": "^14.2.3",
+        "ts-node": "^10.9.2",
+        "typescript": "^5.6.2"
     },
     "files": [
         "dist/**/*"

diff --git a/scripts/prebuild.sh b/scripts/prebuild.sh
@@ -1,3 +1,3 @@
 cd ..
 pnpm i
-ts-node src/dictionary/prepareArrayBeforeBuild.ts
+node src/dictionary/prepareArrayBeforeBuild.mjs
diff --git a/src/core.ts b/src/core.ts
@@ -82,5 +82,5 @@ function deprecatedYopta (text : string, lang: "js" | "ys" = "ys") {
     return compile(text, lang);
 }
 
-global["yscript"]["compile"] = compile;
-global["yopta"] = deprecatedYopta;
+globalThis["yscript"]["compile"] = compile;
+globalThis["yopta"] = deprecatedYopta;
diff --git a/src/dictionary/dictionary.ts → src/dictionary/dictionary.mjs b/src/dictionary/dictionary.ts → src/dictionary/dictionary.mjs
diff --git a/src/dictionary/prepareArrayBeforeBuild.ts → src/dictionary/prepareArrayBeforeBuild.mjs b/src/dictionary/prepareArrayBeforeBuild.ts → src/dictionary/prepareArrayBeforeBuild.mjs
@@ -1,12 +1,12 @@
 // Сортирует массив по самой длинной Yopta фразе перед сборкой
 import * as fs from "fs";
-import { dictionary } from "./dictionary";
+import { dictionary } from "./dictionary.mjs";
 
 /**
  * Сортирует массив по убыванию длины Yopta перевода и сохраняет в JSON файл sortedYopta.json
  * @param dictionary массив 2D массивов ключей
  */
-export function sortDictionaryToFile (dictionary: string[][]): void {
+export function sortDictionaryToFile (dictionary /*: string[][] */)  {
     dictionary.sort((a, b) => b[1].length - a[1].length);
 
     const file = JSON.stringify(dictionary, null, '\t').replace(/\\/g, '');