@ngrx/signals 18.0.0-rc.1 → 18.0.0-rc.3

package/migrations/18_0_0-rc_3-protected-state/index.js

@@ -0,0 +1,93 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var schematics_core_1 = require("../../schematics-core");
+var ts = require("typescript");
+var schematics_core_2 = require("../../schematics-core");
+function migrateWritableStateSource() {
+    return function (tree, ctx) {
+        (0, schematics_core_1.visitTSSourceFiles)(tree, function (sourceFile) {
+            var signalStoreImportedName = findImportedName(sourceFile);
+            if (!signalStoreImportedName) {
+                return;
+            }
+            var changes = [];
+            visitCallExpression(sourceFile, signalStoreImportedName, function (node) {
+                if (node.arguments.length > 0) {
+                    if (ts.isObjectLiteralExpression(node.arguments[0])) {
+                        // signalStore({ providedIn: 'root' })
+                        var providedInProperty = node.arguments[0].properties[0];
+                        if (ts.isPropertyAssignment(providedInProperty) &&
+                            ts.isIdentifier(providedInProperty.name) &&
+                            providedInProperty.name.text === 'providedIn') {
+                            changes.push((0, schematics_core_1.createReplaceChange)(sourceFile, providedInProperty, providedInProperty.getText(), "".concat(providedInProperty.getText(), ", protectedState: false")));
+                        }
+                    }
+                    else {
+                        // signalStore(withState({}))
+                        var firstFeature = node.arguments[0];
+                        changes.push((0, schematics_core_1.createReplaceChange)(sourceFile, firstFeature, firstFeature.getText(), "{ protectedState: false }, ".concat(firstFeature.getText())));
+                    }
+                }
+                else {
+                    // signalStore()
+                    changes.push((0, schematics_core_1.createReplaceChange)(sourceFile, node, node.getText(), "".concat(signalStoreImportedName, "({ protectedState: false })")));
+                }
+            });
+            if (changes.length) {
+                (0, schematics_core_2.commitChanges)(tree, sourceFile.fileName, changes);
+                ctx.logger.info("[@ngrx/signals] Disable protected state in ".concat(sourceFile.fileName));
+            }
+        });
+    };
+}
+exports.default = migrateWritableStateSource;
+function visitCallExpression(node, name, callback) {
+    if (ts.isCallExpression(node) &&
+        ts.isIdentifier(node.expression) &&
+        node.expression.text === name) {
+        callback(node);
+    }
+    ts.forEachChild(node, function (child) {
+        visitCallExpression(child, name, callback);
+    });
+}
+function visitImportDeclaration(node, callback) {
+    if (ts.isImportDeclaration(node)) {
+        callback(node);
+    }
+    ts.forEachChild(node, function (child) {
+        visitImportDeclaration(child, callback);
+    });
+}
+function findImportedName(source) {
+    var importedName = '';
+    visitImportDeclaration(source, function (importDeclaration) {
+        var _a;
+        if (importDeclaration.moduleSpecifier.getText().includes('@ngrx/signals')) {
+            if (importedName) {
+                return;
+            }
+            var namedBindings = (_a = importDeclaration.importClause) === null || _a === void 0 ? void 0 : _a.namedBindings;
+            if (namedBindings && ts.isNamedImports(namedBindings)) {
+                var foundImportedName = namedBindings.elements
+                    .map(function (importSpecifier) {
+                    if (importSpecifier.propertyName &&
+                        importSpecifier.propertyName.text === 'signalStore') {
+                        return importSpecifier.name.text;
+                    }
+                    else if (importSpecifier.name.text === 'signalStore') {
+                        return 'signalStore';
+                    }
+                    return undefined;
+                })
+                    .find(Boolean);
+                if (foundImportedName) {
+                    importedName = foundImportedName;
+                    return;
+                }
+            }
+        }
+    });
+    return importedName;
+}
+//# sourceMappingURL=index.js.map

package/migrations/18_0_0-rc_3-protected-state/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../modules/signals/migrations/18_0_0-rc_3-protected-state/index.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Change,\n  createReplaceChange,\n  visitTSSourceFiles,\n} from '../../schematics-core';\nimport { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';\nimport * as ts from 'typescript';\nimport { commitChanges } from '../../schematics-core';\n\nexport default function migrateWritableStateSource(): Rule {\n  return (tree: Tree, ctx: SchematicContext) => {\n    visitTSSourceFiles(tree, (sourceFile) => {\n      const signalStoreImportedName = findImportedName(sourceFile);\n      if (!signalStoreImportedName) {\n        return;\n      }\n\n      const changes: Change[] = [];\n      visitCallExpression(sourceFile, signalStoreImportedName, (node) => {\n        if (node.arguments.length > 0) {\n          if (ts.isObjectLiteralExpression(node.arguments[0])) {\n            // signalStore({ providedIn: 'root' })\n            const providedInProperty = node.arguments[0].properties[0];\n\n            if (\n              ts.isPropertyAssignment(providedInProperty) &&\n              ts.isIdentifier(providedInProperty.name) &&\n              providedInProperty.name.text === 'providedIn'\n            ) {\n              changes.push(\n                createReplaceChange(\n                  sourceFile,\n                  providedInProperty,\n                  providedInProperty.getText(),\n                  `${providedInProperty.getText()}, protectedState: false`\n                )\n              );\n            }\n          } else {\n            // signalStore(withState({}))\n            const firstFeature = node.arguments[0];\n            changes.push(\n              createReplaceChange(\n                sourceFile,\n                firstFeature,\n                firstFeature.getText(),\n                `{ protectedState: false }, ${firstFeature.getText()}`\n              )\n            );\n          }\n        } else {\n          // signalStore()\n          changes.push(\n            createReplaceChange(\n              sourceFile,\n              node,\n              node.getText(),\n              `${signalStoreImportedName}({ protectedState: false })`\n            )\n          );\n        }\n      });\n\n      if (changes.length) {\n        commitChanges(tree, sourceFile.fileName, changes);\n        ctx.logger.info(\n          `[@ngrx/signals] Disable protected state in ${sourceFile.fileName}`\n        );\n      }\n    });\n  };\n}\n\nfunction visitCallExpression(\n  node: ts.Node,\n  name: string,\n  callback: (callExpression: ts.CallExpression) => void\n) {\n  if (\n    ts.isCallExpression(node) &&\n    ts.isIdentifier(node.expression) &&\n    node.expression.text === name\n  ) {\n    callback(node);\n  }\n\n  ts.forEachChild(node, (child) => {\n    visitCallExpression(child, name, callback);\n  });\n}\n\nfunction visitImportDeclaration(\n  node: ts.Node,\n  callback: (importDeclaration: ts.ImportDeclaration) => void\n) {\n  if (ts.isImportDeclaration(node)) {\n    callback(node);\n  }\n\n  ts.forEachChild(node, (child) => {\n    visitImportDeclaration(child, callback);\n  });\n}\n\nfunction findImportedName(source: ts.SourceFile) {\n  let importedName = '';\n  visitImportDeclaration(source, (importDeclaration) => {\n    if (importDeclaration.moduleSpecifier.getText().includes('@ngrx/signals')) {\n      if (importedName) {\n        return;\n      }\n\n      const namedBindings = importDeclaration.importClause?.namedBindings;\n      if (namedBindings && ts.isNamedImports(namedBindings)) {\n        const foundImportedName = namedBindings.elements\n          .map((importSpecifier) => {\n            if (\n              importSpecifier.propertyName &&\n              importSpecifier.propertyName.text === 'signalStore'\n            ) {\n              return importSpecifier.name.text;\n            } else if (importSpecifier.name.text === 'signalStore') {\n              return 'signalStore';\n            }\n            return undefined;\n          })\n          .find(Boolean);\n\n        if (foundImportedName) {\n          importedName = foundImportedName;\n          return;\n        }\n      }\n    }\n  });\n\n  return importedName;\n}\n"]}

package/migrations/18_0_0-rc_3-writablestatesource/index.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.migrateWritableStateSource = void 0;
+var ts = require("typescript");
+var schematics_1 = require("@angular-devkit/schematics");
+var schematics_core_1 = require("../../schematics-core");
+function migrateWritableStateSource() {
+    return function (tree, ctx) {
+        var updateCounter = 0;
+        ctx.logger.info("[@ngrx/signals] Migrating 'StateSignal' to 'WritableStateSource'");
+        (0, schematics_core_1.visitTSSourceFiles)(tree, function (sourceFile) {
+            var changes = (0, schematics_core_1.replaceImport)(sourceFile, sourceFile.fileName, '@ngrx/signals', 'StateSignal', 'WritableStateSource');
+            if (changes.length) {
+                visitIdentifiers(sourceFile, function (node) {
+                    if (node.getText() === 'StateSignal' &&
+                        !ts.isImportSpecifier(node.parent)) {
+                        changes.push((0, schematics_core_1.createReplaceChange)(sourceFile, node, 'StateSignal', 'WritableStateSource'));
+                        updateCounter++;
+                    }
+                });
+            }
+            (0, schematics_core_1.commitChanges)(tree, sourceFile.fileName, changes);
+        });
+        if (updateCounter) {
+            ctx.logger.info("[@ngrx/signals] Updated ".concat(updateCounter, " references from 'StateSignal' to 'WritableStateSource'"));
+        }
+        else {
+            ctx.logger.info("[@ngrx/signals] No 'StateSignal' refences found to, skipping the migration");
+        }
+    };
+}
+exports.migrateWritableStateSource = migrateWritableStateSource;
+function visitIdentifiers(node, visitor) {
+    if (ts.isIdentifier(node)) {
+        visitor(node);
+    }
+    ts.forEachChild(node, function (childNode) { return visitIdentifiers(childNode, visitor); });
+}
+function default_1() {
+    return (0, schematics_1.chain)([migrateWritableStateSource()]);
+}
+exports.default = default_1;
+//# sourceMappingURL=index.js.map

package/migrations/18_0_0-rc_3-writablestatesource/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../modules/signals/migrations/18_0_0-rc_3-writablestatesource/index.ts"],"names":[],"mappings":";;;AAAA,+BAAiC;AACjC,yDAKoC;AACpC,yDAK+B;AAG/B,SAAgB,0BAA0B;IACxC,OAAO,UAAC,IAAU,EAAE,GAAqB;QACvC,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,GAAG,CAAC,MAAM,CAAC,IAAI,CACb,kEAAkE,CACnE,CAAC;QAEF,IAAA,oCAAkB,EAAC,IAAI,EAAE,UAAC,UAAU;YAClC,IAAM,OAAO,GAAG,IAAA,+BAAa,EAC3B,UAAU,EACV,UAAU,CAAC,QAAgB,EAC3B,eAAe,EACf,aAAa,EACb,qBAAqB,CACtB,CAAC;YAEF,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,gBAAgB,CAAC,UAAU,EAAE,UAAC,IAAI;oBAChC,IACE,IAAI,CAAC,OAAO,EAAE,KAAK,aAAa;wBAChC,CAAC,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,EAClC,CAAC;wBACD,OAAO,CAAC,IAAI,CACV,IAAA,qCAAmB,EACjB,UAAU,EACV,IAAI,EACJ,aAAa,EACb,qBAAqB,CACtB,CACF,CAAC;wBACF,aAAa,EAAE,CAAC;oBAClB,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;YAED,IAAA,+BAAa,EAAC,IAAI,EAAE,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;QAEH,IAAI,aAAa,EAAE,CAAC;YAClB,GAAG,CAAC,MAAM,CAAC,IAAI,CACb,kCAA2B,aAAa,4DAAyD,CAClG,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,MAAM,CAAC,IAAI,CACb,4EAA4E,CAC7E,CAAC;QACJ,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAhDD,gEAgDC;AAED,SAAS,gBAAgB,CACvB,IAAa,EACb,OAAsC;IAEtC,IAAI,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1B,OAAO,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;IAED,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,UAAC,SAAS,IAAK,OAAA,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,EAApC,CAAoC,CAAC,CAAC;AAC7E,CAAC;AAED;IACE,OAAO,IAAA,kBAAK,EAAC,CAAC,0BAA0B,EAAE,CAAC,CAAC,CAAC;AAC/C,CAAC;AAFD,4BAEC","sourcesContent":["import * as ts from 'typescript';\nimport {\n  Tree,\n  Rule,\n  chain,\n  SchematicContext,\n} from '@angular-devkit/schematics';\nimport {\n  commitChanges,\n  createReplaceChange,\n  replaceImport,\n  visitTSSourceFiles,\n} from '../../schematics-core';\nimport { Path } from '@angular-devkit/core';\n\nexport function migrateWritableStateSource(): Rule {\n  return (tree: Tree, ctx: SchematicContext) => {\n    let updateCounter = 0;\n    ctx.logger.info(\n      `[@ngrx/signals] Migrating 'StateSignal' to 'WritableStateSource'`\n    );\n\n    visitTSSourceFiles(tree, (sourceFile) => {\n      const changes = replaceImport(\n        sourceFile,\n        sourceFile.fileName as Path,\n        '@ngrx/signals',\n        'StateSignal',\n        'WritableStateSource'\n      );\n\n      if (changes.length) {\n        visitIdentifiers(sourceFile, (node) => {\n          if (\n            node.getText() === 'StateSignal' &&\n            !ts.isImportSpecifier(node.parent)\n          ) {\n            changes.push(\n              createReplaceChange(\n                sourceFile,\n                node,\n                'StateSignal',\n                'WritableStateSource'\n              )\n            );\n            updateCounter++;\n          }\n        });\n      }\n\n      commitChanges(tree, sourceFile.fileName, changes);\n    });\n\n    if (updateCounter) {\n      ctx.logger.info(\n        `[@ngrx/signals] Updated ${updateCounter} references from 'StateSignal' to 'WritableStateSource'`\n      );\n    } else {\n      ctx.logger.info(\n        `[@ngrx/signals] No 'StateSignal' refences found to, skipping the migration`\n      );\n    }\n  };\n}\n\nfunction visitIdentifiers(\n  node: ts.Node,\n  visitor: (node: ts.Identifier) => void\n) {\n  if (ts.isIdentifier(node)) {\n    visitor(node);\n  }\n\n  ts.forEachChild(node, (childNode) => visitIdentifiers(childNode, visitor));\n}\n\nexport default function (): Rule {\n  return chain([migrateWritableStateSource()]);\n}\n"]}

package/migrations/migration.json

@@ -1,4 +1,15 @@
 {
   "$schema": "../../../node_modules/@angular-devkit/schematics/collection-schema.json",
-  "schematics": {}
+  "schematics": {
+    "18_0_0-rc_3-protected-state": {
+      "description": "Make the state of all existing SignalStores unprotected",
+      "version": "18.0.0-rc.3",
+      "factory": "./18_0_0-rc_3-protected-state/index"
+    },
+    "18_0_0-rc_3-writablestatesource": {
+      "description": "Replace StateSignal usages with WritableStateSource",
+      "version": "18.0.0-rc.3",
+      "factory": "./18_0_0-rc_3-writablestatesource/index"
+    }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngrx/signals",
-  "version": "18.0.0-rc.1",
+  "version": "18.0.0-rc.3",
   "description": "Reactive Store and Set of Utilities for Angular Signals",
   "repository": {
     "type": "git",

package/rxjs-interop/src/rx-method.d.ts

@@ -1,7 +1,6 @@
 import { Injector, Signal } from '@angular/core';
 import { Observable, Unsubscribable } from 'rxjs';
-type RxMethodInput<Input> = Input | Observable<Input> | Signal<Input>;
-type RxMethod<Input> = ((input: RxMethodInput<Input>) => Unsubscribable) & Unsubscribable;
+type RxMethod<Input> = ((input: Input | Signal<Input> | Observable<Input>) => Unsubscribable) & Unsubscribable;
 export declare function rxMethod<Input>(generator: (source$: Observable<Input>) => Observable<unknown>, config?: {
     injector?: Injector;
 }): RxMethod<Input>;

package/src/index.d.ts

@@ -1,11 +1,10 @@
 export { DeepSignal } from './deep-signal';
-export { getState } from './get-state';
-export { PartialStateUpdater, patchState } from './patch-state';
-export { signalState } from './signal-state';
+export { signalState, SignalState } from './signal-state';
 export { signalStore } from './signal-store';
 export { signalStoreFeature, type } from './signal-store-feature';
-export { SignalStoreFeature } from './signal-store-models';
-export { StateSignal } from './state-signal';
+export { EmptyFeatureResult, SignalStoreFeature, SignalStoreFeatureResult, StateSignals, } from './signal-store-models';
+export { getState, PartialStateUpdater, patchState, StateSource, watchState, WritableStateSource, } from './state-source';
+export { Prettify } from './ts-helpers';
 export { withComputed } from './with-computed';
 export { withHooks } from './with-hooks';
 export { withMethods } from './with-methods';

package/src/signal-state.d.ts

@@ -1,5 +1,4 @@
-import { StateSignal } from './state-signal';
+import { WritableStateSource } from './state-source';
 import { DeepSignal } from './deep-signal';
-type SignalState<State extends object> = DeepSignal<State> & StateSignal<State>;
+export type SignalState<State extends object> = DeepSignal<State> & WritableStateSource<State>;
 export declare function signalState<State extends object>(initialState: State): SignalState<State>;
-export {};

package/src/signal-store-assertions.d.ts

@@ -0,0 +1,2 @@
+import { InnerSignalStore } from './signal-store-models';
+export declare function assertUniqueStoreMembers(store: InnerSignalStore, newMemberKeys: string[]): void;

package/src/signal-store-feature.d.ts

@@ -1,22 +1,29 @@
-import { EmptyFeatureResult, MergeFeatureResults, SignalStoreFeature, SignalStoreFeatureResult } from './signal-store-models';
+import { EmptyFeatureResult, SignalStoreFeature, SignalStoreFeatureResult } from './signal-store-models';
 import { Prettify } from './ts-helpers';
+type PrettifyFeatureResult<Result extends SignalStoreFeatureResult> = Prettify<{
+    state: Prettify<Result['state']>;
+    computed: Prettify<Result['computed']>;
+    methods: Prettify<Result['methods']>;
+}>;
 export declare function signalStoreFeature<F1 extends SignalStoreFeatureResult>(f1: SignalStoreFeature<EmptyFeatureResult, F1>): SignalStoreFeature<EmptyFeatureResult, F1>;
-export declare function signalStoreFeature<F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult>(f1: SignalStoreFeature<EmptyFeatureResult, F1>, f2: SignalStoreFeature<{} & F1, F2>): SignalStoreFeature<EmptyFeatureResult, MergeFeatureResults<[F1, F2]>>;
-export declare function signalStoreFeature<F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult>(f1: SignalStoreFeature<EmptyFeatureResult, F1>, f2: SignalStoreFeature<{} & F1, F2>, f3: SignalStoreFeature<MergeFeatureResults<[F1, F2]>, F3>): SignalStoreFeature<EmptyFeatureResult, MergeFeatureResults<[F1, F2, F3]>>;
-export declare function signalStoreFeature<F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult, F4 extends SignalStoreFeatureResult>(f1: SignalStoreFeature<EmptyFeatureResult, F1>, f2: SignalStoreFeature<{} & F1, F2>, f3: SignalStoreFeature<MergeFeatureResults<[F1, F2]>, F3>, f4: SignalStoreFeature<MergeFeatureResults<[F1, F2, F3]>, F4>): SignalStoreFeature<EmptyFeatureResult, MergeFeatureResults<[F1, F2, F3, F4]>>;
-export declare function signalStoreFeature<F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult, F4 extends SignalStoreFeatureResult, F5 extends SignalStoreFeatureResult>(f1: SignalStoreFeature<EmptyFeatureResult, F1>, f2: SignalStoreFeature<{} & F1, F2>, f3: SignalStoreFeature<MergeFeatureResults<[F1, F2]>, F3>, f4: SignalStoreFeature<MergeFeatureResults<[F1, F2, F3]>, F4>, f5: SignalStoreFeature<MergeFeatureResults<[F1, F2, F3, F4]>, F5>): SignalStoreFeature<EmptyFeatureResult, MergeFeatureResults<[F1, F2, F3, F4, F5]>>;
-export declare function signalStoreFeature<F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult, F4 extends SignalStoreFeatureResult, F5 extends SignalStoreFeatureResult, F6 extends SignalStoreFeatureResult>(f1: SignalStoreFeature<EmptyFeatureResult, F1>, f2: SignalStoreFeature<{} & F1, F2>, f3: SignalStoreFeature<MergeFeatureResults<[F1, F2]>, F3>, f4: SignalStoreFeature<MergeFeatureResults<[F1, F2, F3]>, F4>, f5: SignalStoreFeature<MergeFeatureResults<[F1, F2, F3, F4]>, F5>, f6: SignalStoreFeature<MergeFeatureResults<[F1, F2, F3, F4, F5]>, F6>): SignalStoreFeature<EmptyFeatureResult, MergeFeatureResults<[F1, F2, F3, F4, F5, F6]>>;
-export declare function signalStoreFeature<Input extends Partial<SignalStoreFeatureResult>, F1 extends SignalStoreFeatureResult>(input: Input, f1: SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, F1>): SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, F1>;
-export declare function signalStoreFeature<Input extends Partial<SignalStoreFeatureResult>, F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult>(input: Input, f1: SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, F1>, f2: SignalStoreFeature<MergeFeatureResults<[Prettify<EmptyFeatureResult & Input>, F1]>, F2>): SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, MergeFeatureResults<[F1, F2]>>;
-export declare function signalStoreFeature<Input extends Partial<SignalStoreFeatureResult>, F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult>(input: Input, f1: SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, F1>, f2: SignalStoreFeature<MergeFeatureResults<[Prettify<EmptyFeatureResult & Input>, F1]>, F2>, f3: SignalStoreFeature<MergeFeatureResults<[Prettify<EmptyFeatureResult & Input>, F1, F2]>, F3>): SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, MergeFeatureResults<[F1, F2, F3]>>;
-export declare function signalStoreFeature<Input extends Partial<SignalStoreFeatureResult>, F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult, F4 extends SignalStoreFeatureResult>(Input: Input, f1: SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, F1>, f2: SignalStoreFeature<MergeFeatureResults<[Prettify<EmptyFeatureResult & Input>, F1]>, F2>, f3: SignalStoreFeature<MergeFeatureResults<[Prettify<EmptyFeatureResult & Input>, F1, F2]>, F3>, f4: SignalStoreFeature<MergeFeatureResults<[Prettify<EmptyFeatureResult & Input>, F1, F2, F3]>, F4>): SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, MergeFeatureResults<[F1, F2, F3, F4]>>;
-export declare function signalStoreFeature<Input extends Partial<SignalStoreFeatureResult>, F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult, F4 extends SignalStoreFeatureResult, F5 extends SignalStoreFeatureResult>(input: Input, f1: SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, F1>, f2: SignalStoreFeature<MergeFeatureResults<[Prettify<EmptyFeatureResult & Input>, F1]>, F2>, f3: SignalStoreFeature<MergeFeatureResults<[Prettify<EmptyFeatureResult & Input>, F1, F2]>, F3>, f4: SignalStoreFeature<MergeFeatureResults<[Prettify<EmptyFeatureResult & Input>, F1, F2, F3]>, F4>, f5: SignalStoreFeature<MergeFeatureResults<[Prettify<EmptyFeatureResult & Input>, F1, F2, F3, F4]>, F5>): SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, MergeFeatureResults<[F1, F2, F3, F4, F5]>>;
-export declare function signalStoreFeature<Input extends Partial<SignalStoreFeatureResult>, F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult, F4 extends SignalStoreFeatureResult, F5 extends SignalStoreFeatureResult, F6 extends SignalStoreFeatureResult>(input: Input, f1: SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, F1>, f2: SignalStoreFeature<MergeFeatureResults<[Prettify<EmptyFeatureResult & Input>, F1]>, F2>, f3: SignalStoreFeature<MergeFeatureResults<[Prettify<EmptyFeatureResult & Input>, F1, F2]>, F3>, f4: SignalStoreFeature<MergeFeatureResults<[Prettify<EmptyFeatureResult & Input>, F1, F2, F3]>, F4>, f5: SignalStoreFeature<MergeFeatureResults<[Prettify<EmptyFeatureResult & Input>, F1, F2, F3, F4]>, F5>, f6: SignalStoreFeature<MergeFeatureResults<[
-    Prettify<EmptyFeatureResult & Input>,
-    F1,
-    F2,
-    F3,
-    F4,
-    F5
-]>, F6>): SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, MergeFeatureResults<[F1, F2, F3, F4, F5, F6]>>;
+export declare function signalStoreFeature<F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult>(f1: SignalStoreFeature<EmptyFeatureResult, F1>, f2: SignalStoreFeature<{} & F1, F2>): SignalStoreFeature<EmptyFeatureResult, PrettifyFeatureResult<F1 & F2>>;
+export declare function signalStoreFeature<F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult>(f1: SignalStoreFeature<EmptyFeatureResult, F1>, f2: SignalStoreFeature<{} & F1, F2>, f3: SignalStoreFeature<F1 & F2, F3>): SignalStoreFeature<EmptyFeatureResult, PrettifyFeatureResult<F1 & F2 & F3>>;
+export declare function signalStoreFeature<F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult, F4 extends SignalStoreFeatureResult>(f1: SignalStoreFeature<EmptyFeatureResult, F1>, f2: SignalStoreFeature<{} & F1, F2>, f3: SignalStoreFeature<F1 & F2, F3>, f4: SignalStoreFeature<F1 & F2 & F3, F4>): SignalStoreFeature<EmptyFeatureResult, PrettifyFeatureResult<F1 & F2 & F3 & F4>>;
+export declare function signalStoreFeature<F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult, F4 extends SignalStoreFeatureResult, F5 extends SignalStoreFeatureResult>(f1: SignalStoreFeature<EmptyFeatureResult, F1>, f2: SignalStoreFeature<{} & F1, F2>, f3: SignalStoreFeature<F1 & F2, F3>, f4: SignalStoreFeature<F1 & F2 & F3, F4>, f5: SignalStoreFeature<F1 & F2 & F3 & F4, F5>): SignalStoreFeature<EmptyFeatureResult, PrettifyFeatureResult<F1 & F2 & F3 & F4 & F5>>;
+export declare function signalStoreFeature<F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult, F4 extends SignalStoreFeatureResult, F5 extends SignalStoreFeatureResult, F6 extends SignalStoreFeatureResult>(f1: SignalStoreFeature<EmptyFeatureResult, F1>, f2: SignalStoreFeature<{} & F1, F2>, f3: SignalStoreFeature<F1 & F2, F3>, f4: SignalStoreFeature<F1 & F2 & F3, F4>, f5: SignalStoreFeature<F1 & F2 & F3 & F4, F5>, f6: SignalStoreFeature<F1 & F2 & F3 & F4 & F5, F6>): SignalStoreFeature<EmptyFeatureResult, PrettifyFeatureResult<F1 & F2 & F3 & F4 & F5 & F6>>;
+export declare function signalStoreFeature<F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult, F4 extends SignalStoreFeatureResult, F5 extends SignalStoreFeatureResult, F6 extends SignalStoreFeatureResult, F7 extends SignalStoreFeatureResult>(f1: SignalStoreFeature<EmptyFeatureResult, F1>, f2: SignalStoreFeature<{} & F1, F2>, f3: SignalStoreFeature<F1 & F2, F3>, f4: SignalStoreFeature<F1 & F2 & F3, F4>, f5: SignalStoreFeature<F1 & F2 & F3 & F4, F5>, f6: SignalStoreFeature<F1 & F2 & F3 & F4 & F5, F6>, f7: SignalStoreFeature<F1 & F2 & F3 & F4 & F5 & F6, F7>): SignalStoreFeature<EmptyFeatureResult, PrettifyFeatureResult<F1 & F2 & F3 & F4 & F5 & F6 & F7>>;
+export declare function signalStoreFeature<F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult, F4 extends SignalStoreFeatureResult, F5 extends SignalStoreFeatureResult, F6 extends SignalStoreFeatureResult, F7 extends SignalStoreFeatureResult, F8 extends SignalStoreFeatureResult>(f1: SignalStoreFeature<EmptyFeatureResult, F1>, f2: SignalStoreFeature<{} & F1, F2>, f3: SignalStoreFeature<F1 & F2, F3>, f4: SignalStoreFeature<F1 & F2 & F3, F4>, f5: SignalStoreFeature<F1 & F2 & F3 & F4, F5>, f6: SignalStoreFeature<F1 & F2 & F3 & F4 & F5, F6>, f7: SignalStoreFeature<F1 & F2 & F3 & F4 & F5 & F6, F7>, f8: SignalStoreFeature<F1 & F2 & F3 & F4 & F5 & F6 & F7, F8>): SignalStoreFeature<EmptyFeatureResult, PrettifyFeatureResult<F1 & F2 & F3 & F4 & F5 & F6 & F7 & F8>>;
+export declare function signalStoreFeature<F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult, F4 extends SignalStoreFeatureResult, F5 extends SignalStoreFeatureResult, F6 extends SignalStoreFeatureResult, F7 extends SignalStoreFeatureResult, F8 extends SignalStoreFeatureResult, F9 extends SignalStoreFeatureResult>(f1: SignalStoreFeature<EmptyFeatureResult, F1>, f2: SignalStoreFeature<{} & F1, F2>, f3: SignalStoreFeature<F1 & F2, F3>, f4: SignalStoreFeature<F1 & F2 & F3, F4>, f5: SignalStoreFeature<F1 & F2 & F3 & F4, F5>, f6: SignalStoreFeature<F1 & F2 & F3 & F4 & F5, F6>, f7: SignalStoreFeature<F1 & F2 & F3 & F4 & F5 & F6, F7>, f8: SignalStoreFeature<F1 & F2 & F3 & F4 & F5 & F6 & F7, F8>, f9: SignalStoreFeature<F1 & F2 & F3 & F4 & F5 & F6 & F7 & F8, F9>): SignalStoreFeature<EmptyFeatureResult, PrettifyFeatureResult<F1 & F2 & F3 & F4 & F5 & F6 & F7 & F8 & F9>>;
+export declare function signalStoreFeature<F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult, F4 extends SignalStoreFeatureResult, F5 extends SignalStoreFeatureResult, F6 extends SignalStoreFeatureResult, F7 extends SignalStoreFeatureResult, F8 extends SignalStoreFeatureResult, F9 extends SignalStoreFeatureResult, F10 extends SignalStoreFeatureResult>(f1: SignalStoreFeature<EmptyFeatureResult, F1>, f2: SignalStoreFeature<{} & F1, F2>, f3: SignalStoreFeature<F1 & F2, F3>, f4: SignalStoreFeature<F1 & F2 & F3, F4>, f5: SignalStoreFeature<F1 & F2 & F3 & F4, F5>, f6: SignalStoreFeature<F1 & F2 & F3 & F4 & F5, F6>, f7: SignalStoreFeature<F1 & F2 & F3 & F4 & F5 & F6, F7>, f8: SignalStoreFeature<F1 & F2 & F3 & F4 & F5 & F6 & F7, F8>, f9: SignalStoreFeature<F1 & F2 & F3 & F4 & F5 & F6 & F7 & F8, F9>, f10: SignalStoreFeature<F1 & F2 & F3 & F4 & F5 & F6 & F7 & F8 & F9, F10>): SignalStoreFeature<EmptyFeatureResult, PrettifyFeatureResult<F1 & F2 & F3 & F4 & F5 & F6 & F7 & F8 & F9 & F10>>;
+export declare function signalStoreFeature<Input extends Partial<SignalStoreFeatureResult>, F1 extends SignalStoreFeatureResult>(input: Input, f1: SignalStoreFeature<EmptyFeatureResult & NoInfer<Input>, F1>): SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, F1>;
+export declare function signalStoreFeature<Input extends Partial<SignalStoreFeatureResult>, F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult>(input: Input, f1: SignalStoreFeature<EmptyFeatureResult & NoInfer<Input>, F1>, f2: SignalStoreFeature<NoInfer<Input> & F1, F2>): SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, PrettifyFeatureResult<F1 & F2>>;
+export declare function signalStoreFeature<Input extends Partial<SignalStoreFeatureResult>, F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult>(input: Input, f1: SignalStoreFeature<EmptyFeatureResult & NoInfer<Input>, F1>, f2: SignalStoreFeature<NoInfer<Input> & F1, F2>, f3: SignalStoreFeature<NoInfer<Input> & F1 & F2, F3>): SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, PrettifyFeatureResult<F1 & F2 & F3>>;
+export declare function signalStoreFeature<Input extends Partial<SignalStoreFeatureResult>, F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult, F4 extends SignalStoreFeatureResult>(Input: Input, f1: SignalStoreFeature<EmptyFeatureResult & NoInfer<Input>, F1>, f2: SignalStoreFeature<NoInfer<Input> & F1, F2>, f3: SignalStoreFeature<NoInfer<Input> & F1 & F2, F3>, f4: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3, F4>): SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, PrettifyFeatureResult<F1 & F2 & F3 & F4>>;
+export declare function signalStoreFeature<Input extends Partial<SignalStoreFeatureResult>, F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult, F4 extends SignalStoreFeatureResult, F5 extends SignalStoreFeatureResult>(input: Input, f1: SignalStoreFeature<EmptyFeatureResult & NoInfer<Input>, F1>, f2: SignalStoreFeature<NoInfer<Input> & F1, F2>, f3: SignalStoreFeature<NoInfer<Input> & F1 & F2, F3>, f4: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3, F4>, f5: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4, F5>): SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, PrettifyFeatureResult<F1 & F2 & F3 & F4 & F5>>;
+export declare function signalStoreFeature<Input extends Partial<SignalStoreFeatureResult>, F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult, F4 extends SignalStoreFeatureResult, F5 extends SignalStoreFeatureResult, F6 extends SignalStoreFeatureResult>(input: Input, f1: SignalStoreFeature<EmptyFeatureResult & NoInfer<Input>, F1>, f2: SignalStoreFeature<NoInfer<Input> & F1, F2>, f3: SignalStoreFeature<NoInfer<Input> & F1 & F2, F3>, f4: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3, F4>, f5: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4, F5>, f6: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4 & F5, F6>): SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, PrettifyFeatureResult<F1 & F2 & F3 & F4 & F5 & F6>>;
+export declare function signalStoreFeature<Input extends Partial<SignalStoreFeatureResult>, F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult, F4 extends SignalStoreFeatureResult, F5 extends SignalStoreFeatureResult, F6 extends SignalStoreFeatureResult, F7 extends SignalStoreFeatureResult>(input: Input, f1: SignalStoreFeature<EmptyFeatureResult & NoInfer<Input>, F1>, f2: SignalStoreFeature<NoInfer<Input> & F1, F2>, f3: SignalStoreFeature<NoInfer<Input> & F1 & F2, F3>, f4: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3, F4>, f5: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4, F5>, f6: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4 & F5, F6>, f7: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4 & F5 & F6, F7>): SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, PrettifyFeatureResult<F1 & F2 & F3 & F4 & F5 & F6 & F7>>;
+export declare function signalStoreFeature<Input extends Partial<SignalStoreFeatureResult>, F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult, F4 extends SignalStoreFeatureResult, F5 extends SignalStoreFeatureResult, F6 extends SignalStoreFeatureResult, F7 extends SignalStoreFeatureResult, F8 extends SignalStoreFeatureResult>(input: Input, f1: SignalStoreFeature<EmptyFeatureResult & NoInfer<Input>, F1>, f2: SignalStoreFeature<NoInfer<Input> & F1, F2>, f3: SignalStoreFeature<NoInfer<Input> & F1 & F2, F3>, f4: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3, F4>, f5: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4, F5>, f6: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4 & F5, F6>, f7: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4 & F5 & F6, F7>, f8: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4 & F5 & F6 & F7, F8>): SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, PrettifyFeatureResult<F1 & F2 & F3 & F4 & F5 & F6 & F7 & F8>>;
+export declare function signalStoreFeature<Input extends Partial<SignalStoreFeatureResult>, F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult, F4 extends SignalStoreFeatureResult, F5 extends SignalStoreFeatureResult, F6 extends SignalStoreFeatureResult, F7 extends SignalStoreFeatureResult, F8 extends SignalStoreFeatureResult, F9 extends SignalStoreFeatureResult>(input: Input, f1: SignalStoreFeature<EmptyFeatureResult & NoInfer<Input>, F1>, f2: SignalStoreFeature<NoInfer<Input> & F1, F2>, f3: SignalStoreFeature<NoInfer<Input> & F1 & F2, F3>, f4: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3, F4>, f5: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4, F5>, f6: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4 & F5, F6>, f7: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4 & F5 & F6, F7>, f8: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4 & F5 & F6 & F7, F8>, f9: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4 & F5 & F6 & F7 & F8, F9>): SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, PrettifyFeatureResult<F1 & F2 & F3 & F4 & F5 & F6 & F7 & F8 & F9>>;
+export declare function signalStoreFeature<Input extends Partial<SignalStoreFeatureResult>, F1 extends SignalStoreFeatureResult, F2 extends SignalStoreFeatureResult, F3 extends SignalStoreFeatureResult, F4 extends SignalStoreFeatureResult, F5 extends SignalStoreFeatureResult, F6 extends SignalStoreFeatureResult, F7 extends SignalStoreFeatureResult, F8 extends SignalStoreFeatureResult, F9 extends SignalStoreFeatureResult, F10 extends SignalStoreFeatureResult>(input: Input, f1: SignalStoreFeature<EmptyFeatureResult & NoInfer<Input>, F1>, f2: SignalStoreFeature<NoInfer<Input> & F1, F2>, f3: SignalStoreFeature<NoInfer<Input> & F1 & F2, F3>, f4: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3, F4>, f5: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4, F5>, f6: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4 & F5, F6>, f7: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4 & F5 & F6, F7>, f8: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4 & F5 & F6 & F7, F8>, f9: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4 & F5 & F6 & F7 & F8, F9>, f10: SignalStoreFeature<NoInfer<Input> & F1 & F2 & F3 & F4 & F5 & F6 & F7 & F8 & F9, F10>): SignalStoreFeature<Prettify<EmptyFeatureResult & Input>, PrettifyFeatureResult<F1 & F2 & F3 & F4 & F5 & F6 & F7 & F8 & F9 & F10>>;
 export declare function type<T>(): T;
+export {};

package/src/signal-store-models.d.ts

@@ -1,49 +1,30 @@
 import { Signal } from '@angular/core';
 import { DeepSignal } from './deep-signal';
-import { StateSignal } from './state-signal';
+import { WritableStateSource } from './state-source';
 import { IsKnownRecord, Prettify } from './ts-helpers';
-export type SignalStoreConfig = {
-    providedIn: 'root';
-};
-export type SignalStoreSlices<State> = IsKnownRecord<Prettify<State>> extends true ? {
+export type StateSignals<State> = IsKnownRecord<Prettify<State>> extends true ? {
     [Key in keyof State]: IsKnownRecord<State[Key]> extends true ? DeepSignal<State[Key]> : Signal<State[Key]>;
 } : {};
-export type SignalStoreProps<FeatureResult extends SignalStoreFeatureResult> = Prettify<SignalStoreSlices<FeatureResult['state']> & FeatureResult['signals'] & FeatureResult['methods']>;
 export type SignalsDictionary = Record<string, Signal<unknown>>;
 export type MethodsDictionary = Record<string, Function>;
 export type SignalStoreHooks = {
     onInit?: () => void;
     onDestroy?: () => void;
 };
-export type InnerSignalStore<State extends object = object, Signals extends SignalsDictionary = SignalsDictionary, Methods extends MethodsDictionary = MethodsDictionary> = {
-    slices: SignalStoreSlices<State>;
-    signals: Signals;
+export type InnerSignalStore<State extends object = object, ComputedSignals extends SignalsDictionary = SignalsDictionary, Methods extends MethodsDictionary = MethodsDictionary> = {
+    stateSignals: StateSignals<State>;
+    computedSignals: ComputedSignals;
     methods: Methods;
     hooks: SignalStoreHooks;
-} & StateSignal<State>;
+} & WritableStateSource<State>;
 export type SignalStoreFeatureResult = {
     state: object;
-    signals: SignalsDictionary;
+    computed: SignalsDictionary;
     methods: MethodsDictionary;
 };
 export type EmptyFeatureResult = {
     state: {};
-    signals: {};
+    computed: {};
     methods: {};
 };
-export type SignalStoreFeature<Input extends SignalStoreFeatureResult = SignalStoreFeatureResult, Output extends SignalStoreFeatureResult = SignalStoreFeatureResult> = (store: InnerSignalStore<Input['state'], Input['signals'], Input['methods']>) => InnerSignalStore<Output['state'], Output['signals'], Output['methods']>;
-export type MergeFeatureResults<FeatureResults extends SignalStoreFeatureResult[]> = FeatureResults extends [] ? EmptyFeatureResult : FeatureResults extends [infer First extends SignalStoreFeatureResult] ? First : FeatureResults extends [
-    infer First extends SignalStoreFeatureResult,
-    infer Second extends SignalStoreFeatureResult
-] ? MergeTwoFeatureResults<First, Second> : FeatureResults extends [
-    infer First extends SignalStoreFeatureResult,
-    infer Second extends SignalStoreFeatureResult,
-    ...infer Rest extends SignalStoreFeatureResult[]
-] ? MergeFeatureResults<[MergeTwoFeatureResults<First, Second>, ...Rest]> : never;
-type FeatureResultKeys<FeatureResult extends SignalStoreFeatureResult> = keyof FeatureResult['state'] | keyof FeatureResult['signals'] | keyof FeatureResult['methods'];
-type MergeTwoFeatureResults<First extends SignalStoreFeatureResult, Second extends SignalStoreFeatureResult> = {
-    state: Omit<First['state'], FeatureResultKeys<Second>>;
-    signals: Omit<First['signals'], FeatureResultKeys<Second>>;
-    methods: Omit<First['methods'], FeatureResultKeys<Second>>;
-} & Second;
-export {};
+export type SignalStoreFeature<Input extends SignalStoreFeatureResult = SignalStoreFeatureResult, Output extends SignalStoreFeatureResult = SignalStoreFeatureResult> = (store: InnerSignalStore<Input['state'], Input['computed'], Input['methods']>) => InnerSignalStore<Output['state'], Output['computed'], Output['methods']>;