iobroker.javascript 7.0.5 → 7.0.7

package/lib/typescriptTools.js

@@ -203,25 +203,25 @@ function addExportModifier(s) {
     let modifiers;
     // Add export modifiers
     if (!s.modifiers) {
-        modifiers = [ts.createModifier(ts.SyntaxKind.ExportKeyword)];
+        modifiers = [ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)];
     } else if (!s.modifiers.some(m => m.kind === ts.SyntaxKind.ExportKeyword)) {
-        modifiers = [...s.modifiers, ts.createModifier(ts.SyntaxKind.ExportKeyword)];
+        modifiers = [...s.modifiers, ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)];
     } else {
         return s;
     }
 
     if (ts.isVariableStatement(s)) {
-        return ts.updateVariableStatement(s, modifiers, s.declarationList);
+        return ts.factory.updateVariableStatement(s, modifiers, s.declarationList);
     } else if (ts.isTypeAliasDeclaration(s)) {
-        return ts.updateTypeAliasDeclaration(s, s.decorators, modifiers, s.name, s.typeParameters, s.type);
+        return ts.factory.updateTypeAliasDeclaration(s, s.decorators, modifiers, s.name, s.typeParameters, s.type);
     } else if (ts.isInterfaceDeclaration(s)) {
-        return ts.updateInterfaceDeclaration(s, s.decorators, modifiers, s.name, s.typeParameters, s.heritageClauses, s.members);
+        return ts.factory.updateInterfaceDeclaration(s, s.decorators, modifiers, s.name, s.typeParameters, s.heritageClauses, s.members);
     } else if (ts.isEnumDeclaration(s)) {
-        return ts.updateEnumDeclaration(s, s.decorators, modifiers, s.name, s.members);
+        return ts.factory.updateEnumDeclaration(s, s.decorators, modifiers, s.name, s.members);
     } else if (ts.isClassDeclaration(s)) {
-        return ts.updateClassDeclaration(s, s.decorators, modifiers, s.name, s.typeParameters, s.heritageClauses, s.members);
+        return ts.factory.updateClassDeclaration(s, s.decorators, modifiers, s.name, s.typeParameters, s.heritageClauses, s.members);
     } else if (ts.isFunctionDeclaration(s)) {
-        return ts.updateFunctionDeclaration(s, s.decorators, modifiers, s.asteriskToken, s.name, s.typeParameters, s.parameters, s.type, s.body);
+        return ts.factory.updateFunctionDeclaration(s, s.decorators, modifiers, s.asteriskToken, s.name, s.typeParameters, s.parameters, s.type, s.body);
     }
     return s;
 }
@@ -240,17 +240,17 @@ function removeDeclareModifier(s) {
     }
 
     if (ts.isVariableStatement(s)) {
-        return ts.updateVariableStatement(s, modifiers, s.declarationList);
+        return ts.factory.updateVariableStatement(s, modifiers, s.declarationList);
     } else if (ts.isTypeAliasDeclaration(s)) {
-        return ts.updateTypeAliasDeclaration(s, s.decorators, modifiers, s.name, s.typeParameters, s.type);
+        return ts.factory.updateTypeAliasDeclaration(s, s.decorators, modifiers, s.name, s.typeParameters, s.type);
     } else if (ts.isInterfaceDeclaration(s)) {
-        return ts.updateInterfaceDeclaration(s, s.decorators, modifiers, s.name, s.typeParameters, s.heritageClauses, s.members);
+        return ts.factory.updateInterfaceDeclaration(s, s.decorators, modifiers, s.name, s.typeParameters, s.heritageClauses, s.members);
     } else if (ts.isEnumDeclaration(s)) {
-        return ts.updateEnumDeclaration(s, s.decorators, modifiers, s.name, s.members);
+        return ts.factory.updateEnumDeclaration(s, s.decorators, modifiers, s.name, s.members);
     } else if (ts.isClassDeclaration(s)) {
-        return ts.updateClassDeclaration(s, s.decorators, modifiers, s.name, s.typeParameters, s.heritageClauses, s.members);
+        return ts.factory.updateClassDeclaration(s, s.decorators, modifiers, s.name, s.typeParameters, s.heritageClauses, s.members);
     } else if (ts.isFunctionDeclaration(s)) {
-        return ts.updateFunctionDeclaration(s, s.decorators, modifiers, s.asteriskToken, s.name, s.typeParameters, s.parameters, s.type, s.body);
+        return ts.factory.updateFunctionDeclaration(s, s.decorators, modifiers, s.asteriskToken, s.name, s.typeParameters, s.parameters, s.type, s.body);
     }
     return s;
 }
@@ -334,11 +334,10 @@ function isGlobalAugmentation(s) {
 
 /** @param {import("typescript").Statement[]} statements */
 function wrapInDeclareGlobal(statements) {
-    return ts.createModuleDeclaration(
-        undefined,
-        [ts.createModifier(ts.SyntaxKind.DeclareKeyword)],
-        ts.createIdentifier('global'),
-        ts.createModuleBlock(statements),
+    return ts.factory.createModuleDeclaration(
+        [ts.factory.createModifier(ts.SyntaxKind.DeclareKeyword)],
+        ts.factory.createIdentifier('global'),
+        ts.factory.createModuleBlock(statements),
         ts.NodeFlags.GlobalAugmentation
     );
 }
@@ -365,7 +364,7 @@ function transformScriptBeforeCompilation(source, isGlobal) {
                     // If there is no top level await, don't move all the statements around
                     const hasTLA = node.statements.some(s => ts.isExpressionStatement(s) && s.expression.kind === ts.SyntaxKind.AwaitExpression);
                     // Move all statements to the top of the file that cannot appear in a function body
-                    let hoistedStatements = hasTLA ? ts.createNodeArray(nonAugmentations.filter((s) => mustBeHoisted(s, isGlobal))) : ts.createNodeArray(nonAugmentations);
+                    let hoistedStatements = hasTLA ? ts.factory.createNodeArray(nonAugmentations.filter((s) => mustBeHoisted(s, isGlobal))) : ts.factory.createNodeArray(nonAugmentations);
 
                     // The rest gets wrapped
                     const wrappedStatements = hasTLA ? nonAugmentations.filter(s => !mustBeHoisted(s, isGlobal)) : [];
@@ -390,7 +389,7 @@ function transformScriptBeforeCompilation(source, isGlobal) {
                             || !!augmentations
                         );
 
-                    return ts.updateSourceFileNode(node, [
+                    return ts.factory.updateSourceFile(node, [
                         // Put the hoisted statements at the top (or all of them if there's no top level await)
                         ...hoistedStatements,
                         // Then add everything that augments the global scope
@@ -398,11 +397,11 @@ function transformScriptBeforeCompilation(source, isGlobal) {
                         ...(hasTLA
                             ? // If there is a top-level await, wrap all non-hoisted statements in (async () => { ... })();
                             [
-                                ts.createExpressionStatement(
+                                ts.factory.createExpressionStatement(
                                     ts.createCall(
-                                        ts.createArrowFunction(
+                                        ts.factory.createArrowFunction(
                                             [
-                                                ts.createModifier(
+                                                ts.factory.createModifier(
                                                     ts.SyntaxKind.AsyncKeyword
                                                 ),
                                             ],
@@ -410,7 +409,7 @@ function transformScriptBeforeCompilation(source, isGlobal) {
                                             [],
                                             undefined,
                                             undefined,
-                                            ts.createBlock(wrappedStatements)
+                                            ts.factory.createBlock(wrappedStatements)
                                         ),
                                         undefined,
                                         undefined
@@ -421,10 +420,10 @@ function transformScriptBeforeCompilation(source, isGlobal) {
                         ...(needsEmptyExport
                             ? [
                                 // Put an empty export {}; at the bottom to force TypeScript to treat the script as a module
-                                ts.createExportDeclaration(
+                                ts.factory.createExportDeclaration(
                                     undefined,
                                     undefined,
-                                    ts.createNamedExports([]),
+                                    ts.factory.createNamedExports([]),
                                     undefined,
                                     undefined
                                 ),
@@ -469,17 +468,17 @@ function transformGlobalDeclarations(decl) {
                     const hasExportStatements = exportStatements.length > 0;
                     const hasImport = otherStatements.some(s => ts.isImportDeclaration(s) || ts.isImportEqualsDeclaration(s));
 
-                    return ts.updateSourceFileNode(node, [
+                    return ts.factory.updateSourceFile(node, [
                         ...otherStatements,
                         ...(hasExportStatements ? [wrapInDeclareGlobal(exportStatements.map((s) => removeDeclareModifier(s)))] : []),
                         ...(hasImport
                             ? [] // If there is an import, the script is already treated as a module
                             : [
                                 // Otherwise put an empty export {}; at the bottom to force TypeScript to treat the script as a module
-                                ts.createExportDeclaration(
+                                ts.factory.createExportDeclaration(
                                     undefined,
                                     undefined,
-                                    ts.createNamedExports([]),
+                                    ts.factory.createNamedExports([]),
                                     undefined,
                                     undefined,
                                 ),

package/main.js

@@ -2437,18 +2437,18 @@ async function patchFont() {
         dbFile = dbFile.file;
     }
 
-    if (!stat || stat.size !== 62324 || !dbFile || dbFile.byteLength !== 62324) {
+    if (!stat || stat.size !== 73452 || !dbFile || dbFile.byteLength !== 73452) {
         try {
-            const buffer = Buffer.from(JSON.parse(nodeFS.readFileSync(`${__dirname}/admin-config/vsFont/codicon.json`)));
+            const buffer = Buffer.from(JSON.parse(nodeFS.readFileSync(`${__dirname}/admin-config/vsFont/codicon.json`)), 'base64');
 
             const zip = await require('jszip').loadAsync(buffer);
             const data = await zip.file('codicon.ttf').async('arraybuffer');
-            if (data.byteLength !== 62324) {
+            if (data.byteLength !== 73452) {
                 throw new Error('invalid font file!');
             }
             nodeFS.writeFileSync(`${__dirname}/admin/vs/base/browser/ui/codicons/codicon/codicon.ttf`, Buffer.from(data));
             // upload this file
-            await adapter.writeFileAsync('javascript.admin', 'vs/base/browser/ui/codicons/codicon/codicon.ttf', data);
+            await adapter.writeFileAsync('javascript.admin', 'vs/base/browser/ui/codicons/codicon/codicon.ttf', Buffer.from(data));
             return true;
         } catch (error) {
             adapter.log.error(`Cannot patch font: ${error}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.javascript",
-  "version": "7.0.5",
+  "version": "7.0.7",
   "description": "Rules Engine for ioBroker",
   "author": "bluefox <dogafox@gmail.com>",
   "contributors": [
@@ -31,10 +31,10 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^2.6.8",
-    "@types/node": "^20.2.5",
+    "@types/node": "^20.3.0",
     "@types/request": "^2.48.8",
     "axios": "^1.4.0",
-    "coffeescript": "^2.7.0",
+    "coffeescript": "^1.12.7",
     "jsonata": "^2.0.3",
     "jszip": "^3.10.1",
     "node-inspect": "^2.0.0",