@ethlete/core 5.0.0-next.69 → 5.0.0-next.70

package/generators/migrate-to-v5/router-state-service.js

@@ -1,6 +1,7 @@
 import { logger } from '@nx/devkit';
 import * as ts from 'typescript';
 import { collectFiles } from './migration-files.js';
+import { findSyncObservableConsumers } from './sync-observable-consumers.js';
 import { applyReplacementsInClass, collectClasses, findServiceClasses, getServiceImport, isServiceParameter, isServiceProperty, isServiceStillUsed, removeServiceImport, } from './service-classes.js';
 function getPropertyMaps() {
     const signalPropertyMap = {
@@ -838,6 +839,7 @@ export default async function migrateRouterStateService(tree, scope) {
         }
         const sourceFileAfterCleanup = ts.createSourceFile(filePath, updatedContent, ts.ScriptTarget.Latest, true);
         updatedContent = removeUnusedImports(sourceFileAfterCleanup, updatedContent);
+        review.push(...findSyncObservableConsumers(filePath, content, updatedContent));
         if (updatedContent !== content) {
             tree.write(filePath, updatedContent);
             filesModified++;

package/generators/migrate-to-v5/sync-observable-consumers.js

@@ -0,0 +1,80 @@
+import * as ts from 'typescript';
+const MESSAGE = 'reads an observable made by toObservable(), which emits only after its first effect run. Read the signal directly or use computed().';
+export function findSyncObservableConsumers(filePath, originalContent, content) {
+    const sourceFile = ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, true);
+    const isAddedToObservable = (node) => ts.isCallExpression(node) &&
+        ts.isIdentifier(node.expression) &&
+        node.expression.text === 'toObservable' &&
+        !originalContent.includes(node.getText());
+    const containsAddedToObservable = (node) => isAddedToObservable(node) || (ts.forEachChild(node, containsAddedToObservable) ?? false);
+    const asyncNames = new Set();
+    const collectNames = (node) => {
+        if ((ts.isPropertyDeclaration(node) || ts.isVariableDeclaration(node)) &&
+            ts.isIdentifier(node.name) &&
+            node.initializer &&
+            containsAddedToObservable(node.initializer)) {
+            asyncNames.add(node.name.text);
+        }
+        ts.forEachChild(node, collectNames);
+    };
+    collectNames(sourceFile);
+    const isAsyncSource = (expression) => {
+        let root = expression;
+        while (ts.isCallExpression(root) && ts.isPropertyAccessExpression(root.expression)) {
+            root = root.expression.expression;
+        }
+        if (isAddedToObservable(root))
+            return true;
+        if (ts.isIdentifier(root))
+            return asyncNames.has(root.text);
+        return ts.isPropertyAccessExpression(root) && root.expression.kind === ts.SyntaxKind.ThisKeyword
+            ? asyncNames.has(root.name.text)
+            : false;
+    };
+    const findings = [];
+    const visit = (node) => {
+        if (ts.isCallExpression(node) && ts.isIdentifier(node.expression)) {
+            const [source, options] = node.arguments;
+            const name = node.expression.text;
+            if (name === 'toSignal' && source && options && requiresSync(options) && isAsyncSource(source)) {
+                findings.push({ node, label: `toSignal(${flatText(source)}, { requireSync: true })` });
+            }
+            if (name === 'withLatestFrom') {
+                for (const argument of node.arguments.filter(isAsyncSource)) {
+                    findings.push({ node: argument, label: `withLatestFrom(${flatText(argument)})` });
+                }
+            }
+        }
+        if (ts.isCallExpression(node) &&
+            ts.isPropertyAccessExpression(node.expression) &&
+            node.expression.name.text === 'pipe' &&
+            isAsyncSource(node.expression.expression)) {
+            for (const operator of node.arguments.filter(isFirstValueOperator)) {
+                findings.push({ node: operator, label: flatText(operator) });
+            }
+        }
+        ts.forEachChild(node, visit);
+    };
+    visit(sourceFile);
+    return findings
+        .sort((a, b) => a.node.getStart() - b.node.getStart())
+        .map(({ node, label }) => {
+        const line = sourceFile.getLineAndCharacterOfPosition(node.getStart()).line + 1;
+        return `${filePath}:${line}: ${label} ${MESSAGE}`;
+    });
+}
+function requiresSync(options) {
+    return (ts.isObjectLiteralExpression(options) &&
+        options.properties.some((property) => ts.isPropertyAssignment(property) &&
+            property.name.getText() === 'requireSync' &&
+            property.initializer.kind === ts.SyntaxKind.TrueKeyword));
+}
+function isFirstValueOperator(operator) {
+    if (!ts.isCallExpression(operator) || !ts.isIdentifier(operator.expression))
+        return false;
+    const name = operator.expression.text;
+    return name === 'first' || (name === 'take' && operator.arguments[0]?.getText() === '1');
+}
+function flatText(node) {
+    return node.getText().replace(/\s+/g, ' ');
+}

package/generators/migrate-to-v5/viewport-service.js

@@ -1,6 +1,7 @@
 import { logger } from '@nx/devkit';
 import * as ts from 'typescript';
 import { collectFiles } from './migration-files.js';
+import { findSyncObservableConsumers } from './sync-observable-consumers.js';
 import { applyReplacementsInClass, collectClasses, findServiceClasses, getServiceImport, isServiceParameter, isServiceProperty, isServiceStillUsed, removeServiceImport, } from './service-classes.js';
 export default async function migrateViewportService(tree, scope) {
     const tsFiles = collectFiles(tree, scope, ['.ts']);
@@ -91,6 +92,7 @@ export default async function migrateViewportService(tree, scope) {
         }
         const sourceFileAfterCleanup = ts.createSourceFile(filePath, updatedContent, ts.ScriptTarget.Latest, true);
         updatedContent = removeUnusedImports(sourceFileAfterCleanup, updatedContent);
+        review.push(...findSyncObservableConsumers(filePath, content, updatedContent));
         const sourceFileForTemplates = ts.createSourceFile(filePath, updatedContent, ts.ScriptTarget.Latest, true);
         const originalClasses = collectClasses(sourceFile);
         const inlineTemplateEdits = [];

package/migrations.json

@@ -33,6 +33,7 @@
       "level": "required",
       "description": "Rewrite surface theme interactionColor maps into the { color, onColor, inkColor } swatch shape.",
       "generator": "@ethlete/core:migrate-surface-interaction-swatch",
+      "requires": ["ts-morph"],
       "docs": "/core/theming"
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethlete/core",
-  "version": "5.0.0-next.69",
+  "version": "5.0.0-next.70",
   "repository": {
     "type": "git",
     "url": "https://github.com/ethlete-io/ethdk",
@@ -26,7 +26,7 @@
     "@angular/router": "^22.1.0",
     "@ethlete/types": "^2.0.0-beta.4",
     "@floating-ui/dom": "^1.6.0",
-    "@nx/devkit": "^24.0.0",
+    "@nx/devkit": ">=23.0.0",
     "rxjs": "^7.8.0",
     "ts-morph": "^28.0.0",
     "typescript": "^6.0.0"

package/types/ethlete-core.d.ts

@@ -4012,5 +4012,5 @@ export type UnsavedChangesGuardRef<T> = UnsavedChangesTrackerRef<T> & {
  */
 export declare const createUnsavedChangesGuard: <T>(config: CreateUnsavedChangesGuardConfig<T>) => UnsavedChangesGuardRef<T>;
 /** The version of `@ethlete/core` this build was cut from. */
-export declare const CORE_VERSION = "5.0.0-next.69";
+export declare const CORE_VERSION = "5.0.0-next.70";
 export { json_ld_d_exports as JsonLD, type OverlayRuntimeRef, type OverlayRuntimeState };