R!! Use new TypeScript5 API in addons package (#45)

quatico-solutions · May 23, 2023 · af50667 · af50667
2 parents 98a29fc + fa18317
commit af50667
Show file tree

Hide file tree

Showing 12 changed files with 1,940 additions and 2,866 deletions.
diff --git a/package.json b/package.json
@@ -50,33 +50,33 @@
     },
     "devDependencies": {
         "@nrwl/nx-cloud": "latest",
-        "@types/node": "16",
         "@swc/core": "^1.3.57",
         "@swc/jest": "^0.2.26",
+        "@types/node": "16",
         "cross-env": "^7.0.3",
         "eslint": "^8.40.0",
         "eslint-config-prettier": "^8.8.0",
         "eslint-import-resolver-alias": "^1.1.2",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-jest": "^27.2.1",
         "eslint-plugin-prettier": "^4.2.1",
-        "eslint-plugin-testing-library": "^5.10.3",
+        "eslint-plugin-testing-library": "^5.11.0",
         "husky": "^8.0.3",
         "jest": "^29.5.0",
         "lerna": "^6.6.2",
         "license-check-and-add": "^4.0.5",
         "lint-staged": "^13.2.2",
-        "memfs": "3.4.x",
-        "nx": "15.3.x",
+        "memfs": "3.5.x",
+        "nx": "16.1.x",
         "prettier": "^2.8.8",
         "regenerator-runtime": "0.13.11",
         "rimraf": "5.0.0",
         "ts-jest": "^29.1.0",
         "ts-node": "10.9.x",
-        "typescript": "4.7.x"
+        "typescript": "5.0.x"
     },
     "engines": {
-        "node": ">=16.x",
-        "yarn": ">=1.22.x"
+        "node": "16 || 18",
+        "yarn": "1.22.x"
     }
 }
diff --git a/packages/addons/addons/client-function-transform/transformer-client.ts b/packages/addons/addons/client-function-transform/transformer-client.ts
@@ -32,7 +32,7 @@ export const createClientTransformer = ({ libPath, functionsDir }: Transformatio
                 }
 
                 if (ts.isImportDeclaration(node)) {
-                    return undefined;
+                    return node;
                 }
 
                 if (!isTransformable(node)) {
@@ -41,15 +41,15 @@ export const createClientTransformer = ({ libPath, functionsDir }: Transformatio
 
                 const decorations = getDecoration(sf, node, DECORATOR_NAME);
                 if (!isNodeExported(node) || !decorations) {
-                    return undefined;
+                    return node;
                 }
 
                 const [transformedNode, isServiceFunction] = transformNode(node, sf, decorations);
                 hasServiceFunctions = hasServiceFunctions || isServiceFunction;
                 return transformedNode ?? node;
             };
 
-            sf = ts.visitNode(sf, visitor);
+            sf = ts.visitNode(sf, visitor, ts.isSourceFile);
             if (hasServiceFunctions) {
                 if (!hasInvokeImport(sf, libPath, NAMED_IMPORTS)) {
                     sf = ts.factory.updateSourceFile(sf, [getImportInvoke(libPath, NAMED_IMPORTS), ...sf.statements]);
@@ -94,7 +94,6 @@ export const hasInvokeImport = (sf: ts.SourceFile, libPath: string, namedImports
 
 export const getImportInvoke = (libPath: string, namedImports: string[]): ts.Statement => {
     return ts.factory.createImportDeclaration(
-        undefined,
         undefined,
         ts.factory.createImportClause(
             false,

diff --git a/packages/addons/addons/magellan-shared/node-helpers.ts b/packages/addons/addons/magellan-shared/node-helpers.ts
@@ -99,7 +99,6 @@ export const getFunctionName = (node: ts.VariableStatement | ts.FunctionDeclarat
 
 export const createInvokeImport = (libPath: string, namedImports: string[]): ts.Statement => {
     return factory.createImportDeclaration(
-        undefined,
         undefined,
         factory.createImportClause(
             false,

diff --git a/packages/addons/addons/magellan-shared/transform-function.ts b/packages/addons/addons/magellan-shared/transform-function.ts
@@ -111,7 +111,6 @@ export const transformInvocableFunction = (
     const parameters = getObjectLiteralsOfNode(node);
     return factory.updateFunctionDeclaration(
         node,
-        node.decorators,
         node.modifiers,
         node.asteriskToken,
         node.name,
@@ -133,7 +132,6 @@ export const transformLocalServerFunction = (node: ts.Node): ts.Node => {
     const newParameters = createObjectifiedParameter(node);
     return factory.updateFunctionDeclaration(
         node,
-        node.decorators,
         node.modifiers,
         node.asteriskToken,
         node.name,
@@ -178,9 +176,13 @@ const createObjectifiedParameter = (node: ts.Node): ts.ParameterDeclaration[] =>
         parameters?.map(p => factory.createBindingElement(undefined, undefined, factory.createIdentifier(p.name.getText()), undefined)) ?? []
     );
     const typeLiteral = factory.createTypeLiteralNode(
-        parameters?.map(p => factory.createPropertySignature(p.modifiers, p.name.getText(), p.questionToken, p.type))
+        parameters?.map(p => factory.createPropertySignature(
+            // TODO: API clash ModifierLike[] (new) vs. Modifier[] (old)
+            p.modifiers as any, 
+            p.name.getText(), 
+            p.questionToken, p.type))
     );
-    return [factory.createParameterDeclaration(undefined, undefined, undefined, bindingPattern, undefined, typeLiteral, undefined)];
+    return [factory.createParameterDeclaration(undefined, undefined, bindingPattern, undefined, typeLiteral, undefined)];
 };
 
 /**

diff --git a/packages/addons/addons/service-function-generate/transformer-server.ts b/packages/addons/addons/service-function-generate/transformer-server.ts
@@ -52,7 +52,7 @@ export const createServerTransformer = ({ functionsDir }: TransformationArgument
                 return ts.visitEachChild(node, visitor, ctx);
             };
 
-            return ts.visitNode(sf, visitor);
+            return ts.visitNode(sf, visitor, ts.isSourceFile);
         };
     };
     return platformTransformerFactory;

diff --git a/packages/addons/package.json b/packages/addons/package.json
@@ -57,11 +57,11 @@
     "dependencies": {
         "@quatico/magellan-client": "^0.3.0",
         "@quatico/magellan-server": "^0.3.0",
-        "@quatico/websmith-api": "0.3.5",
-        "typescript": "4.7.x"
+        "@quatico/websmith-api": "0.4.0",
+        "typescript": "5.0.x"
     },
     "engines": {
-        "node": "=16 || =18",
-        "yarn": "=1.22.x"
+        "node": "16 || 18",
+        "yarn": "1.22.x"
     }
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -44,13 +44,13 @@
     "dependencies": {
         "@quatico/magellan-client": "^0.3.0",
         "@quatico/magellan-server": "^0.3.0",
-        "@quatico/websmith-api": "0.3.5",
-        "@quatico/websmith-compiler": "0.3.5",
-        "@quatico/websmith-core": "0.3.5",
+        "@quatico/websmith-api": "0.4.0",
+        "@quatico/websmith-compiler": "0.4.0",
+        "@quatico/websmith-core": "0.4.0",
         "commander": "^9.4.1",
         "minimist": "1.2.7",
-        "ts-node": "^10.9.1",
-        "typescript": "4.7.x"
+        "ts-node": "10.9.x",
+        "typescript": "5.0.x"
     },
     "devDependencies": {
         "@swc/core": "^1.3.16",
@@ -75,8 +75,8 @@
         "ts-jest": "^29.0.3"
     },
     "engines": {
-        "node": "=16 || =18",
-        "yarn": "=1.22.x"
+        "node": "16 || 18",
+        "yarn": "1.22.x"
     },
     "nx": {
         "outputs": [

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -56,6 +56,6 @@
         "prettier": "^2.8.8",
         "rimraf": "^5.0.0",
         "ts-jest": "^29.1.0",
-        "typescript": "4.7.x"
+        "typescript": "5.0.x"
     }
 }
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -76,10 +76,10 @@
         "supertest": "^6.3.3",
         "ts-jest": "^29.1.0",
         "ts-node": "10.9.x",
-        "typescript": "4.7.x"
+        "typescript": "5.0.x"
     },
     "engines": {
-        "node": "=16 || =18",
-        "yarn": "=1.22.x"
+        "node": "16 || 18",
+        "yarn": "1.22.x"
     }
 }
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -53,6 +53,6 @@
         "prettier": "^2.7.1",
         "rimraf": "^3.0.2",
         "ts-jest": "^29.0.3",
-        "typescript": "4.7.x"
+        "typescript": "5.0.x"
     }
 }
diff --git a/packages/test/package.json b/packages/test/package.json
@@ -47,10 +47,10 @@
         "memfs": "3.4.x",
         "prettier": "^2.8.8",
         "rimraf": "^5.0.0",
-        "typescript": "4.7.x"
+        "typescript": "5.0.x"
     },
     "engines": {
-        "node": "=16 || =18",
-        "yarn": "=1.22.x"
+        "node": "16 || 18",
+        "yarn": "1.22.x"
     }
 }