nadesiko3 3.3.59 → 3.3.60

package/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nadesiko3core",
-  "version": "3.3.59",
+  "version": "3.3.60",
   "description": "Japanese Programming Language Nadesiko v3 core",
   "main": "index.mjs",
   "type": "module",

package/core/src/nako_core_version.mjs

@@ -1,8 +1,8 @@
 // 実際のバージョン定義 (自動生成されるので以下を編集しない)
 const coreVersion = {
-    version: '3.3.59',
+    version: '3.3.60',
     major: 3,
     minor: 3,
-    patch: 59
+    patch: 60
 };
 export default coreVersion;

package/core/src/nako_core_version.mts

@@ -11,9 +11,9 @@ export interface NakoCoreVersion {
 }
 // 実際のバージョン定義 (自動生成されるので以下を編集しない)
 const coreVersion: NakoCoreVersion = {
-  version: '3.3.59',
+  version: '3.3.60',
   major: 3,
   minor: 3,
-  patch: 59
+  patch: 60
 }
 export default coreVersion

package/core/src/nako_from_dncl.mjs

@@ -192,7 +192,6 @@ export function convertDNCL(tokens) {
                     t.value = t.value.substring(0, t.value.length - 1);
                     t.josi = 'だけ';
                     line.splice(j + 1, 0, NewEmptyToken('word', c, t.indent, t.line, t.file));
-                    console.log(line);
                 }
                 j++;
                 continue;
@@ -211,11 +210,13 @@ export function convertDNCL(tokens) {
         }
         // console.log(t)
     }
+    /*
     // 表示
     lines.map(line => {
-        console.log(line.map(t => t.type + '_' + ('' + t.value).replace('\n', '') + t.josi).join(' | '));
-    });
-    console.log('===');
+      console.log(line.map(t => t.type + '_' + ('' + t.value).replace('\n', '') + t.josi).join(' | '))
+    })
+    console.log('===')
+    */
     tokens = joinTokenLines(lines);
     return tokens;
 }

package/core/src/nako_from_dncl.mts

@@ -171,7 +171,6 @@ export function convertDNCL (tokens: Token[]): Token[] {
           t.value = t.value.substring(0, t.value.length - 1)
           t.josi = 'だけ'
           line.splice(j + 1, 0, NewEmptyToken('word', c, t.indent, t.line, t.file))
-          console.log(line)
         }
         j++
         continue
@@ -191,11 +190,13 @@ export function convertDNCL (tokens: Token[]): Token[] {
     }
     // console.log(t)
   }
+  /*
   // 表示
   lines.map(line => {
     console.log(line.map(t => t.type + '_' + ('' + t.value).replace('\n', '') + t.josi).join(' | '))
   })
   console.log('===')
+  */
   tokens = joinTokenLines(lines)
   return tokens
 }

package/core/src/nako_indent_inline.mjs

@@ -20,6 +20,9 @@ export function convertInlineIndent(tokens) {
         if (line.length === 0) {
             continue;
         }
+        if (line[0].type === 'eol') {
+            continue;
+        }
         // インデントの終了を確認する必要があるか？
         if (checkICount >= 0) {
             const lineICount = lines[i][0].indent;
@@ -65,7 +68,7 @@ export function joinTokenLines(lines) {
             r.push(t);
         }
         // debug
-        // console.log('@@join=', mkIndent(line[0] ? line[0].indent : 0), line.map(t => (t.type + '_' + t.value + ':' + t.indent)).join(' | '))
+        // console.log('@@join=', mkIndent(line[0] ? line[0].indent : 0), line.map(t => (t.type + '_' + t.value + t.josi + ':' + t.indent)).join(' | '))
     }
     // console.log('@@@-----')
     return r;

package/core/src/nako_indent_inline.mts

@@ -17,6 +17,7 @@ export function convertInlineIndent (tokens: Token[]): Token[] {
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i]
     if (line.length === 0) { continue }
+    if (line[0].type === 'eol') { continue }
     // インデントの終了を確認する必要があるか？
     if (checkICount >= 0) {
       const lineICount: number = lines[i][0].indent
@@ -61,7 +62,7 @@ export function joinTokenLines (lines: Token[][]): Token[] {
       r.push(t)
     }
     // debug
-    // console.log('@@join=', mkIndent(line[0] ? line[0].indent : 0), line.map(t => (t.type + '_' + t.value + ':' + t.indent)).join(' | '))
+    // console.log('@@join=', mkIndent(line[0] ? line[0].indent : 0), line.map(t => (t.type + '_' + t.value + t.josi + ':' + t.indent)).join(' | '))
   }
   // console.log('@@@-----')
   return r

package/core/test/flow_test.mjs

@@ -370,40 +370,4 @@ describe('flow_test', async () => {
   it('ならばの直前に空白があるとエラー(#1141)', async () => {
     await cmp('A=30。もし、A>5 ならば、「OK」と表示。', 'OK')
   })
-  // inline indent
-  it('#1215 インラインインデント構文 - 回', async () => {
-    await cmp(
-      '3回:\n' +
-      '  "a"と表示\n', 'a\na\na')
-  })
-  it('#1215 インラインインデント構文 - もし', async () => {
-    await cmp(
-      'A=5;B=3;もし,A>Bならば:\n' +
-      '  "ok"と表示\n' +
-      '違えば:\n' +
-      '  "ng"と表示\n', 'ok')
-  })
-  it('#1215 インラインインデント構文 - エラー監視', async () => {
-    await cmp(
-      'エラー監視:\n' +
-      '  "ok"と表示\n' +
-      'エラーならば:\n' +
-      '  "err"と表示\n',
-      'ok')
-    await cmp(
-      'エラー監視:\n' +
-      '  "aaa"のエラー発生\n' +
-      'エラーならば:\n' +
-      '  "err"と表示\n',
-      'err')
-  })
-  it('#1215 インラインインデント構文3 - ネスト', async () => {
-    await cmp(
-      '3回:\n' +
-      '  もし、5>3ならば:\n' +
-      '    「a」と表示\n' +
-      '  違えば:\n' +
-      '    「b」と表示\n',
-      'a\na\na')
-  })
 })

package/core/test/inline_indent_test.mjs

@@ -0,0 +1,103 @@
+import assert from 'assert'
+import { NakoCompiler } from '../src/nako3.mjs'
+
+describe('inline_indent_test', async () => {
+  // nako.logger.addListener('trace', ({ browserConsole }) => { console.log(...browserConsole) })
+  const cmp = async (/** @type {string} */ code, /** @type {string} */ res) => {
+    const nako = new NakoCompiler()
+    nako.logger.debug('code=' + code)
+    assert.strictEqual((await nako.runAsync(code)).log, res)
+  }
+  it('繰り返す', async () => {
+    await cmp('Nを1から3まで繰り返す:\n  Nを表示\n', '1\n2\n3')
+    await cmp('Nを１から３まで繰り返す:\n　　Nを表示\n', '1\n2\n3')
+  })
+  it('繰り返す2', async () => {
+    await cmp('1から3まで繰り返す\nそれを表示\nここまで', '1\n2\n3')
+  })
+  it('もし-日本語による比較', async () => {
+    await cmp('もし3が3と等しいならば:\n　　「OK」と表示。', 'OK')
+    await cmp('もし(3+2)が5と等しいならば:\n　　「OK」と表示。', 'OK')
+  })
+  it('回-break', async () => {
+    await cmp('3回:\n' +
+              '　　\'a\'と表示。\n' +
+              '　　もし(回数=2)ならば、抜ける\n', 'a\na')
+  })
+  it('反復 - 配列', async () => {
+    await cmp('[1,2,3]を反復:\n  対象を表示\n', '1\n2\n3')
+  })
+  it('反復 - オブジェクト', async () => {
+    await cmp('{\'a\':1,\'b\':2,\'c\':3}を反復:\n  対象を表示\n', '1\n2\n3')
+    await cmp('{\'a\':1,\'b\':2,\'c\':3}を反復:\n  対象キーを表示\n', 'a\nb\nc')
+  })
+  it('反復 - 変数付き', async () => {
+    await cmp('A=[1,2,3];NでAを反復:\n  Nを表示\n', '1\n2\n3')
+    await cmp('Nで[1,2,3]を反復:\n  Nを表示\n', '1\n2\n3')
+  })
+  it('繰り返しのネスト', async () => {
+    await cmp('C=0;Iを0から3まで繰り返す:\n  Jを0から3まで繰り返す:\n    C=C+1;\nCを表示', '16')
+  })
+  it('もし、と戻るの組み合わせ', async () => {
+    await cmp('●テスト処理:\n' +
+              '　　「あ」と表示\n' +
+              '　　もし、3=3ならば、戻る。\n' +
+              '　　「ここには来ない」と表示\n' +
+              '\n' +
+              'テスト処理。', 'あ')
+  })
+  it('もし文のエラー(#378)', async () => {
+    await cmp('●AAAとは:\n' +
+              '　　列を1から3まで繰り返す:\n' +
+              '　　　　列を表示。' +
+              '　　　　もし、列=2ならば、「*」と表示。\n' +
+              'AAA', '1\n2\n*\n3')
+  })
+  it('「増繰り返す」「減繰り返す」を追加#1140', async () => {
+    await cmp('Nを0から4まで2ずつ増やし繰り返す:\n　　Nを表示\n', '0\n2\n4')
+  })
+  // inline indent
+  it('#1215 インラインインデント構文 - 回', async () => {
+    await cmp('3回:\n' +
+              '  "a"と表示\n', 'a\na\na')
+  })
+  it('#1215 インラインインデント構文 - もし', async () => {
+    await cmp(
+      'A=5;B=3;もし,A>Bならば:\n' +
+      '  "ok"と表示\n' +
+      '違えば:\n' +
+      '  "ng"と表示\n', 'ok')
+  })
+  it('#1215 インラインインデント構文 - エラー監視', async () => {
+    await cmp(
+      'エラー監視:\n' +
+      '  "ok"と表示\n' +
+      'エラーならば:\n' +
+      '  "err"と表示\n',
+      'ok')
+    await cmp(
+      'エラー監視:\n' +
+      '  "aaa"のエラー発生\n' +
+      'エラーならば:\n' +
+      '  "err"と表示\n',
+      'err')
+  })
+  it('#1215 インラインインデント構文3 - ネスト', async () => {
+    await cmp(
+      '3回:\n' +
+      '  もし、5>3ならば:\n' +
+      '    「a」と表示\n' +
+      '  違えば:\n' +
+      '    「b」と表示\n',
+      'a\na\na')
+  })
+  it('#1273 インラインインデントで無駄な区切り文字の問題', async () => {
+    await cmp(
+      '3回:\n' +
+      '  もし、5>3ならば:\n' +
+      '    「a」と表示。\n' +
+      '  違えば:\n' +
+      '    「b」と表示。\n',
+      'a\na\na')
+  })
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nadesiko3",
-  "version": "3.3.59",
+  "version": "3.3.60",
   "description": "Japanese Programming Language",
   "type": "module",
   "main": "src/index.mjs",

package/release/_hash.txt

@@ -9,10 +9,10 @@ editor.js:
   sha256(base64): mWPVpxYoegeIn6u0PanyI4Z8eRx41UD/kBYns489U04=
   sha512(base64): q9aYWdo2RiNlmsa4gSoQL70F4RkvG/lAUxOYew1tXdyJre4KSm7EWQp9m9+CgexV+sLcOg3DJ3+0/FW8Uu2DIg==
 nako_gen_async.js:
-  md5(hex): 2eb839a0130ac51ec248266f957f04bf
-  sha256(hex): 13e2e4d27364257ad5392081874329f64e9bfd6714404b616ea07ae4370719fb
-  sha256(base64): E+Lk0nNkJXrVOSCBh0Mp9k6b/WcUQEthbqB65DcHGfs=
-  sha512(base64): ZI48k2q3EVpEI3+oLvARdQ/f6dBJDtyzl7muSK1HJukLAnm3G39mD8hVA0BfIoVdtbqGF3yM2wkC37+xKmXAuA==
+  md5(hex): e697ebeb4fa0a1fbc03ddb02b2b7fa33
+  sha256(hex): 7b54792b5817eeb8eacff63d47f25020d6f50cbc4942b9ceddb19f13ef201448
+  sha256(base64): e1R5K1gX7rjqz/Y9R/JQINb1DLxJQrnO3bGfE+8gFEg=
+  sha512(base64): iM3q843vry1CUZSb7xdaRDnbPr7uxBz8Iq9K1ABhMo65Oh4dyxkTVwsstovd2U7kHejOsm7F+fV9KeMfu26YLw==
 plugin_caniuse.js:
   md5(hex): 95a7a5c98a92a46b6435e577daba3241
   sha256(hex): 57638b3979be70b45ab8085861f6b2ece43200bd6aa92765d73caf76b9e6fea9
@@ -54,17 +54,17 @@ plugin_weykturtle3d.js:
   sha256(base64): ND/1JqYrFVGTIPYsbBk+tScnF8RVzgYPM0/E2aE8GRw=
   sha512(base64): T4B8Cvhn9j5YdMGk4rwPInfqmcXtGEjD2g6X6wSqXvYyIXuSy+t1RVf1viZ2zljHlk3wN6pwKvvg/NIJvfMAzw==
 version.js:
-  md5(hex): 33c93e6441f46b0554e25751c0c5e463
-  sha256(hex): c22bff9afabbecb11e2eb1935ed034450328c29f778c226f9c64a49d20eb5c60
-  sha256(base64): wiv/mvq77LEeLrGTXtA0RQMowp93jCJvnGSknSDrXGA=
-  sha512(base64): ggHpplQRbs2OLMAhu4vPOP84C9B1UD+I3lZte1nXDkLWyhX75ayYpREaHv7SVHd2zp5YtsiXJ7ExZB+Te6Iqrw==
+  md5(hex): 4079fe3144af4d2138e9f53bdd7b127c
+  sha256(hex): dba689c23545cb8ffe6329766fb5724a54abaf35999164df31755b41eeb989b7
+  sha256(base64): 26aJwjVFy4/+Yyl2b7VySlSrrzWZkWTfMXVbQe65ibc=
+  sha512(base64): 8l9z3XJGeKACofpa7/PKagMbYeX+uSx64KWRxzgCVMRRS+pVMWK6uYSo8GF3qGB9lNOx48JWdehkQ+CQqA0+/w==
 wnako3.js:
-  md5(hex): 16a1442e8c2c999358fbcd7242df75a5
-  sha256(hex): cea33f4d585acc8ac94c05d463686c1c146d0f473fa1dd18b4c4cfbf7b582c78
-  sha256(base64): zqM/TVhazIrJTAXUY2hsHBRtD0c/od0YtMTPv3tYLHg=
-  sha512(base64): niN5uq8TSfDxyBuRTneofo4VG6ny3WiqAnM2UtqDzm26WeMvpf9w7hqqqishSGWVa9KVqSbIgwUkg+NlypF9eA==
+  md5(hex): e65b17987be7b964cafc7f44e437fcb9
+  sha256(hex): 644c1c7d539253a0756ae45bbe0bce1dbdf67ea6b1a084e0f645ea51289486a3
+  sha256(base64): ZEwcfVOSU6B1auRbvgvOHb32fqaxoITg9kXqUSiUhqM=
+  sha512(base64): fjunKsOP4AkePxDKkrYqLKGbsTWCY/4xTkp+/7Ip20GdPQ75hYd3iKBiG1hZw1lGGBrGajTTrdpKGkBPFQEL9Q==
 wnako3webworker.js:
-  md5(hex): 2387c08f3e6a38f3f05257765c6932c6
-  sha256(hex): 1f31b5d00d6acd4f5a48b1a63bfa2293f3cdcef414df36ff5208f149de431c4e
-  sha256(base64): HzG10A1qzU9aSLGmO/oik/PNzvQU3zb/UgjxSd5DHE4=
-  sha512(base64): JXnei1cMOIFdIEznOYPFCKitBl/iiq6GpT4N77yvrOBOaj6G5tHnBjUeaXFzdExTx0lhRbOWiwu0ZDnY8TvuQA==
+  md5(hex): d2d3fe6f32deb89785585ed9b3b8a0bb
+  sha256(hex): 0730ff512a2fb3c44aa0225c28a83f45e44755d4b41999f5cc718e2e62017169
+  sha256(base64): BzD/USovs8RKoCJcKKg/ReRHVdS0GZn1zHGOLmIBcWk=
+  sha512(base64): 95QfPbuqhr9wwSKwInj4BsXYxjFfTf3AYICv3eODBDn6xGUDU05Z5bjqGIt7a+ju5wzF2jU/GC4c/TT7n1uFKg==

package/release/_script-tags.txt

@@ -1,14 +1,14 @@
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.59&f=release/command.json.js" integrity="sha512-3PHGfRGcyV9VPBflXtm5cP2qT4kGyPgTpCyrFhjUXMHQKRf6+2yGK6VCcAV6KCOkjWIzKVCGeoDo4Pzp+YtckQ==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.59&f=release/editor.js" integrity="sha512-q9aYWdo2RiNlmsa4gSoQL70F4RkvG/lAUxOYew1tXdyJre4KSm7EWQp9m9+CgexV+sLcOg3DJ3+0/FW8Uu2DIg==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.59&f=release/nako_gen_async.js" integrity="sha512-ZI48k2q3EVpEI3+oLvARdQ/f6dBJDtyzl7muSK1HJukLAnm3G39mD8hVA0BfIoVdtbqGF3yM2wkC37+xKmXAuA==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.59&f=release/plugin_caniuse.js" integrity="sha512-NbX6BKUNq1J8xwtv5CThQC54Lb/KxaPlimRpsF745nxqjYeuGD7S70j4yOgNm4Uwd7AN5FgezS6NDyhlvoJF2w==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.59&f=release/plugin_csv.js" integrity="sha512-mQvmj25L2Nc2L7gN1rTjayHVMMPhc7TCSiBsuKS4JKOQqN+91uj9qpLAOejzR1ib5jIOBdtrhN+secNTU9BJtw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.59&f=release/plugin_datetime.js" integrity="sha512-1ADTZFkcfU6vpEEJZEYmIbqS6G2XViooDFD4198P61n7VKZ0PhEVj9l8ULFGrW7woSbDqfSPZmkZ7yvcRqPKYA==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.59&f=release/plugin_kansuji.js" integrity="sha512-tXC9Q6LejwYG+HUbXcwBHFmhwTsqiMHOBohLNcSx8b02hxk3waPUEQRWeNP7QxAFMv5BOAY+Grruf+XKmmU26g==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.59&f=release/plugin_markup.js" integrity="sha512-pvb+QYO9LMUH055nPJJ5QaWyEYR3wDkHHilV5LLNyxObs7enlHGiF7Jt3Csd93JTdJ3n9hxFbTqWa1QuzVmTfQ==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.59&f=release/plugin_turtle.js" integrity="sha512-3/BlAe3uVDBgJrgFWzLJa3bvNQVhAQuL343Icict5hI3LndcPjV6mAD8KoWRlxmF8A8S6n8eKnmrh6NFWTjyEw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.59&f=release/plugin_webworker.js" integrity="sha512-JLlIg9cW9UgM2AT+qMgEuKvea3t8R+1jihhlN/QGDQe7iCaGEfXfKG5gpvRb0IUyisNfzncUN8AfLn9wyxGGiw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.59&f=release/plugin_weykturtle3d.js" integrity="sha512-T4B8Cvhn9j5YdMGk4rwPInfqmcXtGEjD2g6X6wSqXvYyIXuSy+t1RVf1viZ2zljHlk3wN6pwKvvg/NIJvfMAzw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.59&f=release/version.js" integrity="sha512-ggHpplQRbs2OLMAhu4vPOP84C9B1UD+I3lZte1nXDkLWyhX75ayYpREaHv7SVHd2zp5YtsiXJ7ExZB+Te6Iqrw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.59&f=release/wnako3.js" integrity="sha512-niN5uq8TSfDxyBuRTneofo4VG6ny3WiqAnM2UtqDzm26WeMvpf9w7hqqqishSGWVa9KVqSbIgwUkg+NlypF9eA==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.59&f=release/wnako3webworker.js" integrity="sha512-JXnei1cMOIFdIEznOYPFCKitBl/iiq6GpT4N77yvrOBOaj6G5tHnBjUeaXFzdExTx0lhRbOWiwu0ZDnY8TvuQA==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.60&f=release/command.json.js" integrity="sha512-3PHGfRGcyV9VPBflXtm5cP2qT4kGyPgTpCyrFhjUXMHQKRf6+2yGK6VCcAV6KCOkjWIzKVCGeoDo4Pzp+YtckQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.60&f=release/editor.js" integrity="sha512-q9aYWdo2RiNlmsa4gSoQL70F4RkvG/lAUxOYew1tXdyJre4KSm7EWQp9m9+CgexV+sLcOg3DJ3+0/FW8Uu2DIg==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.60&f=release/nako_gen_async.js" integrity="sha512-iM3q843vry1CUZSb7xdaRDnbPr7uxBz8Iq9K1ABhMo65Oh4dyxkTVwsstovd2U7kHejOsm7F+fV9KeMfu26YLw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.60&f=release/plugin_caniuse.js" integrity="sha512-NbX6BKUNq1J8xwtv5CThQC54Lb/KxaPlimRpsF745nxqjYeuGD7S70j4yOgNm4Uwd7AN5FgezS6NDyhlvoJF2w==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.60&f=release/plugin_csv.js" integrity="sha512-mQvmj25L2Nc2L7gN1rTjayHVMMPhc7TCSiBsuKS4JKOQqN+91uj9qpLAOejzR1ib5jIOBdtrhN+secNTU9BJtw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.60&f=release/plugin_datetime.js" integrity="sha512-1ADTZFkcfU6vpEEJZEYmIbqS6G2XViooDFD4198P61n7VKZ0PhEVj9l8ULFGrW7woSbDqfSPZmkZ7yvcRqPKYA==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.60&f=release/plugin_kansuji.js" integrity="sha512-tXC9Q6LejwYG+HUbXcwBHFmhwTsqiMHOBohLNcSx8b02hxk3waPUEQRWeNP7QxAFMv5BOAY+Grruf+XKmmU26g==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.60&f=release/plugin_markup.js" integrity="sha512-pvb+QYO9LMUH055nPJJ5QaWyEYR3wDkHHilV5LLNyxObs7enlHGiF7Jt3Csd93JTdJ3n9hxFbTqWa1QuzVmTfQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.60&f=release/plugin_turtle.js" integrity="sha512-3/BlAe3uVDBgJrgFWzLJa3bvNQVhAQuL343Icict5hI3LndcPjV6mAD8KoWRlxmF8A8S6n8eKnmrh6NFWTjyEw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.60&f=release/plugin_webworker.js" integrity="sha512-JLlIg9cW9UgM2AT+qMgEuKvea3t8R+1jihhlN/QGDQe7iCaGEfXfKG5gpvRb0IUyisNfzncUN8AfLn9wyxGGiw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.60&f=release/plugin_weykturtle3d.js" integrity="sha512-T4B8Cvhn9j5YdMGk4rwPInfqmcXtGEjD2g6X6wSqXvYyIXuSy+t1RVf1viZ2zljHlk3wN6pwKvvg/NIJvfMAzw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.60&f=release/version.js" integrity="sha512-8l9z3XJGeKACofpa7/PKagMbYeX+uSx64KWRxzgCVMRRS+pVMWK6uYSo8GF3qGB9lNOx48JWdehkQ+CQqA0+/w==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.60&f=release/wnako3.js" integrity="sha512-fjunKsOP4AkePxDKkrYqLKGbsTWCY/4xTkp+/7Ip20GdPQ75hYd3iKBiG1hZw1lGGBrGajTTrdpKGkBPFQEL9Q==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.60&f=release/wnako3webworker.js" integrity="sha512-95QfPbuqhr9wwSKwInj4BsXYxjFfTf3AYICv3eODBDn6xGUDU05Z5bjqGIt7a+ju5wzF2jU/GC4c/TT7n1uFKg==" crossorigin="anonymous"></script>