@nstudio/angular 17.0.1 → 19.0.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nstudio/angular",
-  "version": "17.0.1",
+  "version": "19.0.0-alpha.0",
   "description": "Angular Plugin for xplat",
   "homepage": "https://nstudio.io/xplat",
   "repository": {
@@ -29,9 +29,9 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/angular": "^17.0.0"
+    "@nx/angular": "^19.0.0"
   },
   "peerDependencies": {
-    "@nstudio/xplat": "17.0.1"
+    "@nstudio/xplat": "19.0.0-alpha.0"
   }
 }

package/src/utils/ast.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTsSourceFile = exports.getDecoratorPropertyValueNode = exports.readBootstrapInfo = exports.addEntryComponents = exports.addDeclarationToModule = exports.addProviderToComponent = exports.addProviderToModule = exports.addProviderToBootstrapApplication = exports.addRouteToNgModule = exports.getBootstrapComponent = exports.replaceIntoToTestBed = exports.addDeclarationsToTestBed = exports.addImportToTestBed = exports.addImportToModule = exports.addImportToPipe = exports.addImportToDirective = exports.addImportToComponent = exports.removeFromNgModule = exports._addSymbolToNgModuleMetadata = exports.getDecoratorMetadata = exports.isStandalone = exports.addToCollection = void 0;
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-const typescript_1 = require("nx/src/utils/typescript");
-const ts = require("typescript");
 const js_1 = require("@nx/js");
+const ts = require("typescript");
+const js_2 = require("@nx/js");
 const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
 let tsModule;
@@ -16,15 +16,15 @@ function addToCollection(tree, source, barrelIndexPath, symbolName, insertSpaces
     // return [new NoopChange()];
     // console.log('collection.hasTrailingComma:', collection.hasTrailingComma);
     if (collection.hasTrailingComma || collection.length === 0) {
-        return (0, js_1.insertChange)(tree, source, barrelIndexPath, collection.end, symbolName);
+        return (0, js_2.insertChange)(tree, source, barrelIndexPath, collection.end, symbolName);
     }
     else {
-        return (0, js_1.insertChange)(tree, source, barrelIndexPath, collection.end, `,\n${insertSpaces}${symbolName}`);
+        return (0, js_2.insertChange)(tree, source, barrelIndexPath, collection.end, `,\n${insertSpaces}${symbolName}`);
     }
 }
 exports.addToCollection = addToCollection;
 function getCollection(source) {
-    const allCollections = (0, typescript_1.findNodes)(source, ts.SyntaxKind.ArrayLiteralExpression);
+    const allCollections = (0, js_1.findNodes)(source, ts.SyntaxKind.ArrayLiteralExpression);
     // console.log('allCollections:', allCollections);
     // allCollections.forEach((i: ts.ArrayLiteralExpression) => {
     //   console.log('getText:',i.getText());
@@ -97,7 +97,7 @@ function getDecoratorMetadata(source, identifier, module) {
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
-    const angularImports = (0, typescript_1.findNodes)(source, tsModule.SyntaxKind.ImportDeclaration)
+    const angularImports = (0, js_1.findNodes)(source, tsModule.SyntaxKind.ImportDeclaration)
         .map((node) => _angularImportsFromNode(node, source))
         .reduce((acc, current) => {
         for (const key of Object.keys(current)) {
@@ -105,7 +105,7 @@ function getDecoratorMetadata(source, identifier, module) {
         }
         return acc;
     }, {});
-    return (0, js_1.getSourceNodes)(source)
+    return (0, js_2.getSourceNodes)(source)
         .filter((node) => {
         return (node.kind == tsModule.SyntaxKind.Decorator &&
             node.expression.kind ==
@@ -186,7 +186,7 @@ function _addSymbolToDecoratorMetadata(host, source, filePath, metadataField, ex
                 toInsert = `, ${metadataField}: [${expression}]`;
             }
         }
-        return (0, js_1.insertChange)(host, source, filePath, position, toInsert);
+        return (0, js_2.insertChange)(host, source, filePath, position, toInsert);
     }
     const assignment = matchingProperties[0];
     // If it's not an array, nothing we can do really.
@@ -253,7 +253,7 @@ function _addSymbolToDecoratorMetadata(host, source, filePath, metadataField, ex
             toInsert = `, ${expression}`;
         }
     }
-    return (0, js_1.insertChange)(host, source, filePath, position, toInsert);
+    return (0, js_2.insertChange)(host, source, filePath, position, toInsert);
 }
 function _addSymbolToNgModuleMetadata(host, source, ngModulePath, metadataField, expression) {
     return _addSymbolToDecoratorMetadata(host, source, ngModulePath, metadataField, expression, 'NgModule');
@@ -269,7 +269,7 @@ function removeFromNgModule(host, source, modulePath, property) {
     // Get all the children property assignment of object literals.
     const matchingProperty = getMatchingProperty(source, property, 'NgModule', '@angular/core');
     if (matchingProperty) {
-        return (0, js_1.removeChange)(host, source, modulePath, matchingProperty.getStart(source), matchingProperty.getFullText(source));
+        return (0, js_2.removeChange)(host, source, modulePath, matchingProperty.getStart(source), matchingProperty.getFullText(source));
     }
 }
 exports.removeFromNgModule = removeFromNgModule;
@@ -321,7 +321,7 @@ function addImportToTestBed(host, source, specPath, symbolName) {
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
-    const allCalls = ((0, typescript_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
+    const allCalls = ((0, js_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
     const configureTestingModuleObjectLiterals = allCalls
         .filter((c) => c.expression.kind === tsModule.SyntaxKind.PropertyAccessExpression)
         .filter((c) => c.expression.name.getText(source) === 'configureTestingModule')
@@ -332,7 +332,7 @@ function addImportToTestBed(host, source, specPath, symbolName) {
         const startPosition = configureTestingModuleObjectLiterals[0]
             .getFirstToken(source)
             .getEnd();
-        return (0, js_1.insertChange)(host, source, specPath, startPosition, `imports: [${symbolName}], `);
+        return (0, js_2.insertChange)(host, source, specPath, startPosition, `imports: [${symbolName}], `);
     }
     return source;
 }
@@ -341,7 +341,7 @@ function addDeclarationsToTestBed(host, source, specPath, symbolName) {
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
-    const allCalls = ((0, typescript_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
+    const allCalls = ((0, js_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
     const configureTestingModuleObjectLiterals = allCalls
         .filter((c) => c.expression.kind === tsModule.SyntaxKind.PropertyAccessExpression)
         .filter((c) => c.expression.name.getText(source) === 'configureTestingModule')
@@ -352,7 +352,7 @@ function addDeclarationsToTestBed(host, source, specPath, symbolName) {
         const startPosition = configureTestingModuleObjectLiterals[0]
             .getFirstToken(source)
             .getEnd();
-        return (0, js_1.insertChange)(host, source, specPath, startPosition, `declarations: [${symbolName.join(',')}], `);
+        return (0, js_2.insertChange)(host, source, specPath, startPosition, `declarations: [${symbolName.join(',')}], `);
     }
     return source;
 }
@@ -361,7 +361,7 @@ function replaceIntoToTestBed(host, source, specPath, newSymbol, previousSymbol)
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
-    const allCalls = ((0, typescript_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
+    const allCalls = ((0, js_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
     const configureTestingModuleObjectLiterals = allCalls
         .filter((c) => c.expression.kind === tsModule.SyntaxKind.PropertyAccessExpression)
         .filter((c) => c.expression.name.getText(source) === 'configureTestingModule')
@@ -372,7 +372,7 @@ function replaceIntoToTestBed(host, source, specPath, newSymbol, previousSymbol)
         const startPosition = configureTestingModuleObjectLiterals[0]
             .getFirstToken(source)
             .getEnd();
-        return (0, js_1.replaceChange)(host, source, specPath, startPosition, newSymbol, previousSymbol);
+        return (0, js_2.replaceChange)(host, source, specPath, startPosition, newSymbol, previousSymbol);
     }
     return source;
 }
@@ -404,10 +404,10 @@ function addRouteToNgModule(host, ngModulePath, source, route) {
     if (!routes)
         return source;
     if (routes.hasTrailingComma || routes.length === 0) {
-        return (0, js_1.insertChange)(host, source, ngModulePath, routes.end, route);
+        return (0, js_2.insertChange)(host, source, ngModulePath, routes.end, route);
     }
     else {
-        return (0, js_1.insertChange)(host, source, ngModulePath, routes.end, `, ${route}`);
+        return (0, js_2.insertChange)(host, source, ngModulePath, routes.end, `, ${route}`);
     }
 }
 exports.addRouteToNgModule = addRouteToNgModule;
@@ -431,7 +431,7 @@ function getListOfRoutes(source) {
                     }
                     else if (routes.kind === tsModule.SyntaxKind.Identifier) {
                         // find the array expression
-                        const variableDeclarations = (0, typescript_1.findNodes)(source, tsModule.SyntaxKind.VariableDeclaration);
+                        const variableDeclarations = (0, js_1.findNodes)(source, tsModule.SyntaxKind.VariableDeclaration);
                         const routesDeclaration = variableDeclarations.find((x) => {
                             return x.name.getText() === routes.getText();
                         });
@@ -515,7 +515,7 @@ function readBootstrapInfo(host, app) {
     }
     const mainSource = host.read(mainPath).toString('utf-8');
     const main = tsModule.createSourceFile(mainPath, mainSource, tsModule.ScriptTarget.Latest, true);
-    const moduleImports = (0, js_1.getImport)(main, (s) => s.indexOf('.module') > -1);
+    const moduleImports = (0, js_2.getImport)(main, (s) => s.indexOf('.module') > -1);
     if (moduleImports.length !== 1) {
         throw new Error(`main.ts can only import a single module`);
     }

package/src/utils/testing.js

@@ -7,7 +7,7 @@ const testing_1 = require("@angular-devkit/schematics/testing");
 // import { names, toFileName } from '@nx/workspace';
 const testRunner = new testing_1.SchematicTestRunner('@nstudio/angular', (0, path_1.join)(__dirname, '../../collection.json'));
 function runSchematic(schematicName, options, tree) {
-    return testRunner.runSchematicAsync(schematicName, options, tree).toPromise();
+    return testRunner.runSchematic(schematicName, options, tree);
 }
 exports.runSchematic = runSchematic;
 // export function runSchematicSync(

package/src/utils/versions.d.ts

@@ -1,9 +1,9 @@
 export declare const xplatVersion = "*";
-export declare const nxVersion = "^17.0.0";
-export declare const angularVersion = "^16.0.0";
-export declare const angularDevkitVersion = "^16.0.0";
-export declare const ngxTranslateVersion = "~14.0.0";
-export declare const ngxTranslateHttpVersion = "~7.0.0";
+export declare const nxVersion = "^19.0.0";
+export declare const angularVersion = "^18.0.0";
+export declare const angularDevkitVersion = "^18.0.0";
+export declare const ngxTranslateVersion = "~15.0.0";
+export declare const ngxTranslateHttpVersion = "~8.0.0";
 export declare const rxjsVersion = "^7.8.0";
-export declare const zonejsVersion = "~0.13.0";
+export declare const zonejsVersion = "~0.14.0";
 export declare const typesJest = "29.5.6";

package/src/utils/versions.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.typesJest = exports.zonejsVersion = exports.rxjsVersion = exports.ngxTranslateHttpVersion = exports.ngxTranslateVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = exports.xplatVersion = void 0;
-exports.xplatVersion = '17.0.1';
-exports.nxVersion = '^17.0.0';
-exports.angularVersion = '^16.0.0';
-exports.angularDevkitVersion = '^16.0.0';
-exports.ngxTranslateVersion = '~14.0.0';
-exports.ngxTranslateHttpVersion = '~7.0.0';
+exports.xplatVersion = '19.0.0-alpha.0';
+exports.nxVersion = '^19.0.0';
+exports.angularVersion = '^18.0.0';
+exports.angularDevkitVersion = '^18.0.0';
+exports.ngxTranslateVersion = '~15.0.0';
+exports.ngxTranslateHttpVersion = '~8.0.0';
 exports.rxjsVersion = '^7.8.0';
-exports.zonejsVersion = '~0.13.0';
+exports.zonejsVersion = '~0.14.0';
 exports.typesJest = '29.5.6';