From c32ab463373bd806149eeeb012f31531654dfcd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B8=D0=BB=20=D0=9A=D0=B0=D0=BF?=
 =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BA=D0=BE?= <m.kapelko@iva-tech.ru>
Date: Thu, 8 Jun 2023 19:35:38 +0300
Subject: [PATCH] d

---
 shared/JavaScript/memoryGap.js                |  4 ---
 shared/JavaScript/memoryItemPositions.js      |  4 ---
 shared/JavaScript/memorySide.js               |  3 ---
 shared/JavaScript/memorySpace.js              |  3 ---
 shared/gen                                    | 13 ++--------
 shared/javaScript.js                          | 26 +++++++++++++++++++
 shared/memoryGap.ts                           |  4 ---
 shared/memorySide.ts                          |  3 ---
 shared/memorySpace.ts                         |  3 ---
 .../{memoryItemPositions.ts => typeScript.ts} | 12 +++++++++
 web/memory.html                               |  5 +---
 будущее                                |  8 +++++-
 12 files changed, 48 insertions(+), 40 deletions(-)
 delete mode 100644 shared/JavaScript/memoryGap.js
 delete mode 100644 shared/JavaScript/memoryItemPositions.js
 delete mode 100644 shared/JavaScript/memorySide.js
 delete mode 100644 shared/JavaScript/memorySpace.js
 create mode 100644 shared/javaScript.js
 delete mode 100644 shared/memoryGap.ts
 delete mode 100644 shared/memorySide.ts
 delete mode 100644 shared/memorySpace.ts
 rename shared/{memoryItemPositions.ts => typeScript.ts} (73%)

diff --git a/shared/JavaScript/memoryGap.js b/shared/JavaScript/memoryGap.js
deleted file mode 100644
index 118e2ab..0000000
--- a/shared/JavaScript/memoryGap.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// @ts-nocheck
-function memoryGap() {
-    return memorySide() + memorySpace();
-}
diff --git a/shared/JavaScript/memoryItemPositions.js b/shared/JavaScript/memoryItemPositions.js
deleted file mode 100644
index 118e2ab..0000000
--- a/shared/JavaScript/memoryItemPositions.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// @ts-nocheck
-function memoryGap() {
-    return memorySide() + memorySpace();
-}
diff --git a/shared/JavaScript/memorySide.js b/shared/JavaScript/memorySide.js
deleted file mode 100644
index 21fc46a..0000000
--- a/shared/JavaScript/memorySide.js
+++ /dev/null
@@ -1,3 +0,0 @@
-function memorySide() {
-    return 50;
-}
diff --git a/shared/JavaScript/memorySpace.js b/shared/JavaScript/memorySpace.js
deleted file mode 100644
index 3a7d4de..0000000
--- a/shared/JavaScript/memorySpace.js
+++ /dev/null
@@ -1,3 +0,0 @@
-function memorySpace() {
-    return 20;
-}
diff --git a/shared/gen b/shared/gen
index 4c5bc4a..d4c4b85 100755
--- a/shared/gen
+++ b/shared/gen
@@ -2,15 +2,6 @@
 
 SCRIPT_DIR=$(cd "$(dirname "$0")" ; pwd -P)
 
-FILES=(
-  memoryGap
-  memoryItemPositions
-  memorySide
-  memorySpace
-)
-
-for file in ${FILES[*]}; do
-  $SCRIPT_DIR/../toSwift $SCRIPT_DIR/$file.ts $SCRIPT_DIR/Swift/$file.swift
-  tsc $SCRIPT_DIR/$file.ts --outfile $SCRIPT_DIR/JavaScript/$file.js
-done
+tsc $SCRIPT_DIR/typeScript.ts --outfile $SCRIPT_DIR/javaScript.js
+#$SCRIPT_DIR/../toSwift $SCRIPT_DIR/typeScript.ts $SCRIPT_DIR/swift.swift
 
diff --git a/shared/javaScript.js b/shared/javaScript.js
new file mode 100644
index 0000000..e758e9a
--- /dev/null
+++ b/shared/javaScript.js
@@ -0,0 +1,26 @@
+var Position = /** @class */ (function () {
+    function Position(x, y) {
+        this.x = x;
+        this.y = y;
+    }
+    return Position;
+}());
+function memoryGap() {
+    return memorySide() + memorySpace();
+}
+function memorySide() {
+    return 50;
+}
+function memorySpace() {
+    return 20;
+}
+function memoryItemPositions(c) {
+    var pos = [];
+    for (var i = 0; i < c.itemsCount; i++) {
+        var row = Math.floor(i / 4);
+        var x = memoryGap() + (i - row * 4) * memoryGap();
+        var y = memoryGap() + row * memoryGap();
+        pos.push(new Position(x, y));
+    }
+    return pos;
+}
diff --git a/shared/memoryGap.ts b/shared/memoryGap.ts
deleted file mode 100644
index fb7dda4..0000000
--- a/shared/memoryGap.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// @ts-nocheck
-function memoryGap(): number {
-  return memorySide() + memorySpace()
-}
diff --git a/shared/memorySide.ts b/shared/memorySide.ts
deleted file mode 100644
index 109aa35..0000000
--- a/shared/memorySide.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-function memorySide(): number {
-  return 50
-}
diff --git a/shared/memorySpace.ts b/shared/memorySpace.ts
deleted file mode 100644
index b55e57b..0000000
--- a/shared/memorySpace.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-function memorySpace(): number {
-  return 20
-}
diff --git a/shared/memoryItemPositions.ts b/shared/typeScript.ts
similarity index 73%
rename from shared/memoryItemPositions.ts
rename to shared/typeScript.ts
index f818fca..6c7cccc 100644
--- a/shared/memoryItemPositions.ts
+++ b/shared/typeScript.ts
@@ -12,6 +12,18 @@ class Position {
   }
 }
 
+function memoryGap(): number {
+  return memorySide() + memorySpace()
+}
+
+function memorySide(): number {
+  return 50
+}
+
+function memorySpace(): number {
+  return 20
+}
+
 function memoryItemPositions(c: Context): Position[] {
   var pos: Position[] = []
   for (var i = 0; i < c.itemsCount; i++) {
diff --git a/web/memory.html b/web/memory.html
index 6a38491..1edab03 100644
--- a/web/memory.html
+++ b/web/memory.html
@@ -5,10 +5,7 @@
   </head>
   <body>
   </body>
-  <script src="../shared/JavaScript/memoryGap.js"></script>
-  <script src="../shared/JavaScript/memoryItemPositions.js"></script>
-  <script src="../shared/JavaScript/memorySide.js"></script>
-  <script src="../shared/JavaScript/memorySpace.js"></script>
+  <script src="../shared/javaScript.js"></script>
   <script>
     var items = []
 
diff --git a/будущее b/будущее
index 7c41c25..c3b6a07 100644
--- a/будущее
+++ b/будущее
@@ -1,6 +1,12 @@
+08.06: 19:30-
 
-НАДО:
 * перейти на один файл ts
+* перейти на один файл js
+
+НАДО:
+* оставить в файле ts лишь interfaces
+* ввести внешние функции создания экземпляров интерфейсов
+* перейти на один файл swift
 * генерить по одному файлу в shared
   * в проектах ссылаться по одному файлу
 * исправить ошибку tsc: cannot find name