as-model 0.3.2 → 0.3.4

package/dist/index.js

@@ -1362,10 +1362,10 @@ function createStores(modelKeys) {
     destroyed: false
   };
   var storeUnits = modelKeys.map(function(modelKey) {
-    if (typeof modelKey === "function") {
+    if (typeof modelKey === "function" && typeof modelKey.createStore === "function") {
       return modelKey.createStore();
     }
-    var k = modelKey.key;
+    var k = typeof modelKey === "function" ? modelKey : modelKey.key;
     return createStore(k, "defaultState" in k ? _object_spread_props(_object_spread({}, config2), {
       state: k.defaultState
     }) : config2);

package/esm/key/index.js

@@ -33,10 +33,10 @@ createKey.isModelKey = isModelKey;
 function createStores(modelKeys, config = {}) {
   const state = { destroyed: false };
   const storeUnits = modelKeys.map((modelKey) => {
-    if (typeof modelKey === "function") {
+    if (typeof modelKey === "function" && typeof modelKey.createStore === "function") {
       return modelKey.createStore();
     }
-    const k = modelKey.key;
+    const k = typeof modelKey === "function" ? modelKey : modelKey.key;
     return createStore(
       k,
       "defaultState" in k ? __spreadProps(__spreadValues({}, config), { state: k.defaultState }) : config

package/index.d.ts

@@ -27,9 +27,7 @@ declare type ValidInstance<S, T extends ModelInstance> = {
       : T[K];
 };
 
-export declare type Model<S = any, T extends ModelInstance = any> = (
-  state: S
-) => ValidInstance<S, T>;
+export declare type Model = (state: any) => any;
 
 export type PickState<R extends Model> = R extends (state: infer S) => any
   ? S
@@ -57,7 +55,7 @@ export interface Token {
 export declare type Dispatch = (action: Action) => any;
 
 export declare interface Key<
-  M extends Model = any,
+  M extends Model = Model,
   R extends undefined | ((instance: () => Instance<M>) => any) = undefined
 > extends M {
   (s: PickState<M>): Instance<M>;
@@ -68,7 +66,7 @@ export declare interface Key<
   defaultState?: PickState<M>;
 }
 
-declare interface UpdaterStore<S = any, T extends ModelInstance = any> {
+declare interface UpdaterStore<S = any, T = any> {
   getState: () => { state: S; instance: T };
   dispatch: (action: Action) => void;
 }
@@ -89,14 +87,14 @@ export declare interface Config {
 /** createStore * */
 
 export declare interface StoreIndex<
-  M extends Model = any,
+  M extends Model = Model,
   R extends undefined | ((instance: () => Instance<M>) => any) = any
 > {
   key: Key<M, R>;
 }
 
 export declare interface Store<
-  M extends Model = any,
+  M extends Model = Model,
   R extends undefined | ((instance: () => Instance<M>) => any) = undefined
 > extends StoreIndex<M, R> {
   subscribe: (dispatcher: Dispatch) => () => void;
@@ -128,16 +126,15 @@ export declare function createStore<
 /** createKey * */
 
 export declare interface ModelKey<
-  M extends Model = any,
+  M extends Model = Model,
   R extends undefined | ((instance: () => Instance<M>) => any) = undefined
 > extends Key<M, R> {
-  (s: PickState<M>): Instance<M>;
   createStore: <D extends PickState<M>>(initialState?: D) => Store<M, R>;
   extends: <E extends Record<string, any>>(e: E) => ModelKey<M, R> & E;
 }
 
 export declare function createKey<
-  M extends Model = any,
+  M extends Model = Model,
   D extends PickState<M>,
   R extends undefined | ((instance: () => Instance<M>) => any) = undefined
 >(model: M | ModelUsage<M, R>, initialState?: D): ModelKey<M, R>;
@@ -146,7 +143,7 @@ export declare function createKey<
 
 export declare interface StoreCollection {
   find: <
-    M extends Model = any,
+    M extends Model = Model,
     R extends undefined | ((instance: () => Instance<M>) => any) = undefined
   >(
     key: Key<M, R> | StoreIndex<M, R>
@@ -210,7 +207,7 @@ export interface SignalOptions {
 
 // eslint-disable-next-line @typescript-eslint/no-redeclare
 declare interface SignalStore<
-  M extends Model = any,
+  M extends Model = Model,
   R extends undefined | ((instance: () => Instance<M>) => any) = undefined
 > extends StoreIndex<M, R> {
   getToken: () => Token;
@@ -229,7 +226,7 @@ declare interface SignalStore<
 }
 
 export declare function createSignal<
-  M extends Model = any,
+  M extends Model = Model,
   R extends undefined | ((instance: () => Instance<M>) => any) = undefined
 >(store: Store<M, R>): SignalStore<M, R>;
 
@@ -264,7 +261,7 @@ declare type SelectMethod<
 
 // eslint-disable-next-line @typescript-eslint/no-redeclare
 declare interface SelectorStore<
-  M extends Model = any,
+  M extends Model = Model,
   R extends undefined | ((instance: () => Instance<M>) => any) = undefined
 > extends StoreIndex<M, R> {
   getToken: () => Token;
@@ -277,7 +274,7 @@ declare interface SelectorOption<T = any> {
 }
 
 export declare function createSelector<
-  M extends Model = any,
+  M extends Model = Model,
   R extends undefined | ((instance: () => Instance<M>) => any) = undefined
 >(store: Store<M, R>, opts?: SelectorOption): SelectorStore<M, R>;
 

package/package.json

@@ -1,68 +1,68 @@
-{
-  "private": false,
-  "name": "as-model",
-  "version": "0.3.2",
-  "description": "This is a model state management tool",
-  "license": "MIT",
-  "author": "Jimmy.Harding",
-  "homepage": "https://github.com/filefoxper/a-model",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/filefoxper/a-model"
-  },
-  "main": "dist/index.js",
-  "module": "esm/index.js",
-  "files": [
-    "dist",
-    "esm",
-    "index.d.ts"
-  ],
-  "scripts": {
-    "build": "node ./build.js",
-    "docs": "docsify serve ./docs",
-    "lint": "eslint src --fix --ext .ts,.tsx ",
-    "lint-init": "eslint --init",
-    "test": "jest --coverage"
-  },
-  "typings": "index.d.ts",
-  "devDependencies": {
-    "@babel/cli": "^7.27.2",
-    "@babel/core": "^7.27.4",
-    "@babel/eslint-parser": "^7.27.5",
-    "@babel/plugin-transform-runtime": "^7.27.4",
-    "@babel/preset-env": "^7.27.2",
-    "@babel/preset-typescript": "^7.27.1",
-    "@babel/runtime": "^7.27.6",
-    "@pmnps/plugin-publish": "4.5.0",
-    "@types/jest": "^29.5.14",
-    "babel-jest": "29.7.0",
-    "esbuild": "^0.25.0",
-    "esbuild-plugin-es5": "2.1.1",
-    "eslint": "^8.49.0",
-    "eslint-config-airbnb": "^19.0.4",
-    "eslint-config-airbnb-typescript": "^17.1.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-import-resolver-typescript": "^3.6.0",
-    "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-jsx-a11y": "^6.7.1",
-    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-unused-imports": "^2.0.0",
-    "eslint-webpack-plugin": "^4.0.1",
-    "jest": "29.7.0",
-    "jest-environment-jsdom": "29.7.0",
-    "pmnps": "^4.5.3",
-    "prettier": "^3.0.3",
-    "prettier-eslint": "^15.0.1",
-    "prettier-eslint-cli": "^7.1.0",
-    "ts-node": "^10.8.1",
-    "typescript": "^4.9.5"
-  },
-  "keywords": [
-    "model",
-    "state",
-    "state-management",
-    "typescript"
-  ]
-}
+{
+  "private": false,
+  "name": "as-model",
+  "version": "0.3.4",
+  "description": "This is a model state management tool",
+  "license": "MIT",
+  "author": "Jimmy.Harding",
+  "homepage": "https://github.com/filefoxper/a-model",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/filefoxper/a-model"
+  },
+  "main": "dist/index.js",
+  "module": "esm/index.js",
+  "files": [
+    "dist",
+    "esm",
+    "index.d.ts"
+  ],
+  "scripts": {
+    "build": "node ./build.js",
+    "docs": "docsify serve ./docs",
+    "lint": "eslint src --fix --ext .ts,.tsx ",
+    "lint-init": "eslint --init",
+    "test": "jest --coverage"
+  },
+  "typings": "index.d.ts",
+  "devDependencies": {
+    "@babel/cli": "^7.27.2",
+    "@babel/core": "^7.27.4",
+    "@babel/eslint-parser": "^7.27.5",
+    "@babel/plugin-transform-runtime": "^7.27.4",
+    "@babel/preset-env": "^7.27.2",
+    "@babel/preset-typescript": "^7.27.1",
+    "@babel/runtime": "^7.27.6",
+    "@pmnps/plugin-publish": "4.5.0",
+    "@types/jest": "^29.5.14",
+    "babel-jest": "29.7.0",
+    "esbuild": "^0.25.0",
+    "esbuild-plugin-es5": "2.1.1",
+    "eslint": "^8.49.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-airbnb-typescript": "^17.1.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-import-resolver-typescript": "^3.6.0",
+    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-jsx-a11y": "^6.7.1",
+    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-unused-imports": "^2.0.0",
+    "eslint-webpack-plugin": "^4.0.1",
+    "jest": "29.7.0",
+    "jest-environment-jsdom": "29.7.0",
+    "pmnps": "^4.5.3",
+    "prettier": "^3.0.3",
+    "prettier-eslint": "^15.0.1",
+    "prettier-eslint-cli": "^7.1.0",
+    "ts-node": "^10.8.1",
+    "typescript": "^4.9.5"
+  },
+  "keywords": [
+    "model",
+    "state",
+    "state-management",
+    "typescript"
+  ]
+}