as-model 0.3.3 → 0.4.0

package/dist/index.js

@@ -21,12 +21,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   config: () => config,
-  createKey: () => createKey2,
   createSelector: () => createSelector,
   createSignal: () => createSignal,
-  createStore: () => createStore2,
-  createStores: () => createStores2,
-  model: () => model,
   shallowEqual: () => shallowEqual,
   validations: () => validations
 });
@@ -420,9 +416,9 @@ function generateNotifier(updater, middleWare) {
     });
   }
   var dispatch = function dispatch2(action) {
-    var dispatches = updater.dispatches, controlled = updater.controlled, model2 = updater.model, config2 = updater.config;
+    var dispatches = updater.dispatches, controlled = updater.controlled, model = updater.model, config3 = updater.config;
     var state = action.state;
-    var nextInstance = model2(state);
+    var nextInstance = model(state);
     var nextAction = _object_spread_props(_object_spread({}, action), {
       instance: nextInstance
     });
@@ -465,8 +461,8 @@ function generateNotifier(updater, middleWare) {
       throw errors[0];
     };
     try {
-      if (typeof config2.notify === "function") {
-        config2.notify(notifyAction, nextAction);
+      if (typeof config3.notify === "function") {
+        config3.notify(notifyAction, nextAction);
       } else {
         notifyActionWithErrorThrow(nextAction);
       }
@@ -667,7 +663,7 @@ function createUpdateFn(updater, middleWare) {
     var args = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
     updater.mutate(function(u, effect) {
       var _args_model;
-      var model2 = (_args_model = args.model) !== null && _args_model !== void 0 ? _args_model : u.model;
+      var model = (_args_model = args.model) !== null && _args_model !== void 0 ? _args_model : u.model;
       var hasState = Object.prototype.hasOwnProperty.call(args, "state");
       var hasInitialState = Object.prototype.hasOwnProperty.call(args, "initialState");
       var state = hasState ? args.state : u.state;
@@ -675,11 +671,11 @@ function createUpdateFn(updater, middleWare) {
       var token = createToken();
       if (u.controlled) {
         var controlledState = hasInitialState && !hasState ? args.initialState : state;
-        var instance = model2(controlledState);
+        var instance = model(controlledState);
         return _object_spread_props(_object_spread({}, u), {
           state: controlledState,
           instance,
-          model: model2
+          model
         });
       }
       if (u.isDestroyed) {
@@ -690,17 +686,17 @@ function createUpdateFn(updater, middleWare) {
       }
       if (isInitialize) {
         var initialState = hasInitialState ? args.initialState : state;
-        var instance1 = model2(initialState);
+        var instance1 = model(initialState);
         var initializedUpdater = createInitializedUpdater(u, middleWare);
         return _object_spread(_object_spread_props(_object_spread({}, u), {
-          model: model2,
+          model,
           state: initialState,
           instance: instance1,
           initialized: true,
           token
         }), initializedUpdater);
       }
-      if (Object.is(u.model, model2) && Object.is(u.state, state)) {
+      if (Object.is(u.model, model) && Object.is(u.state, state)) {
         return u;
       }
       effect(function(up) {
@@ -714,7 +710,7 @@ function createUpdateFn(updater, middleWare) {
         });
       });
       return _object_spread_props(_object_spread({}, u), {
-        model: model2,
+        model,
         initialized: true,
         cacheFields: {},
         cacheMethods: {}
@@ -723,18 +719,18 @@ function createUpdateFn(updater, middleWare) {
   };
 }
 var lazyModel = createNoStateModel();
-function createUpdater(model2, middleWare) {
-  var config2 = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
-  var hasDefaultState = "state" in config2;
-  var controlled = config2.controlled, defaultState = config2.state;
-  var defaultInstance = hasDefaultState ? model2(defaultState) : lazyModel(void 0);
+function createUpdater(model, middleWare) {
+  var config3 = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
+  var hasDefaultState = "state" in config3;
+  var controlled = config3.controlled, defaultState = config3.state;
+  var defaultInstance = hasDefaultState ? model(defaultState) : lazyModel(void 0);
   var unInitializedUpdater = createUnInitializedUpdater();
   var updater = _object_spread({
     sidePayload: void 0,
     version: 0,
     token: createToken(),
     isDestroyed: false,
-    model: model2,
+    model,
     instance: defaultInstance,
     dispatch: null,
     dispatches: [],
@@ -745,7 +741,7 @@ function createUpdater(model2, middleWare) {
     initialized: hasDefaultState,
     controlled: !!controlled,
     isSubscribing: false,
-    config: config2,
+    config: config3,
     payload: function payload(setter) {
       if (typeof setter === "function") {
         updater.sidePayload = setter(updater.sidePayload);
@@ -1222,42 +1218,42 @@ function createSelector(store, opts) {
 
 // src/store/index.ts
 function createPrimaryKey(modelFn) {
-  var config2 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+  var config3 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
   var ifModelKey = isModelKey(modelFn);
   var ifModelUsage = isModelUsage(modelFn);
-  var model2 = ifModelKey ? modelFn.source : modelFn;
+  var model = ifModelKey ? modelFn.source : modelFn;
   var _config_wrapper;
-  var wrapper = (_config_wrapper = config2.wrapper) !== null && _config_wrapper !== void 0 ? _config_wrapper : ifModelKey || ifModelUsage ? modelFn.wrapper : function defaultSelector2(i) {
+  var wrapper = (_config_wrapper = config3.wrapper) !== null && _config_wrapper !== void 0 ? _config_wrapper : ifModelKey || ifModelUsage ? modelFn.wrapper : function defaultSelector2(i) {
     return i();
   };
   var wrapModel = function wrapModel2(state) {
-    return model2(state);
+    return model(state);
   };
-  wrapModel.source = model2;
+  wrapModel.source = model;
   wrapModel.wrapper = wrapper;
   wrapModel.modelKeyIdentifier = modelKeyIdentifier;
-  if ("state" in config2) {
-    wrapModel.defaultState = config2.state;
+  if ("state" in config3) {
+    wrapModel.defaultState = config3.state;
   }
   return wrapModel;
 }
 function createStore(modelLike) {
-  var config2 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+  var config3 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
   var ifModelKey = isModelKey(modelLike);
-  var model2 = ifModelKey ? modelLike.source : modelLike;
+  var model = ifModelKey ? modelLike.source : modelLike;
   var modelKey = ifModelKey ? modelLike : void 0;
   var conf = function computeConfig() {
-    var hasConfigState = "state" in config2;
+    var hasConfigState = "state" in config3;
     var hasKeyState = !!modelKey && "defaultState" in modelKey;
     if (hasConfigState) {
-      return config2;
+      return config3;
     }
     if (hasKeyState) {
-      return _object_spread_props(_object_spread({}, config2), {
+      return _object_spread_props(_object_spread({}, config3), {
         state: modelKey === null || modelKey === void 0 ? void 0 : modelKey.defaultState
       });
     }
-    return config2;
+    return config3;
   }();
   var combinedMiddleWare = function combinedMiddleWare2(s) {
     return function updaterMiddleWare(next) {
@@ -1273,8 +1269,8 @@ function createStore(modelLike) {
       }, next);
     };
   };
-  var updater = createUpdater(model2, combinedMiddleWare, conf);
-  var key = modelKey !== null && modelKey !== void 0 ? modelKey : createPrimaryKey(model2, config2);
+  var updater = createUpdater(model, combinedMiddleWare, conf);
+  var key = modelKey !== null && modelKey !== void 0 ? modelKey : createPrimaryKey(model, config3);
   var propertiesCache = {
     target: updater.instance,
     cacheFields: {},
@@ -1317,7 +1313,7 @@ function createStore(modelLike) {
         updater.update(_object_spread_props(_object_spread({}, rest1), {
           model: updatingModel1
         }));
-        store.key = createPrimaryKey(updatingModel1, config2);
+        store.key = createPrimaryKey(updatingModel1, config3);
         return;
       }
       updater.update(args);
@@ -1343,12 +1339,12 @@ var createField2 = createField;
 var createMethod2 = createMethod;
 
 // src/key/index.ts
-function createKey(model2) {
-  var config2 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-  var wrapModel = createPrimaryKey(model2, config2);
+function createKey(model) {
+  var config3 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+  var wrapModel = createPrimaryKey(model, config3);
   wrapModel.createStore = function createKeyStore() {
     var storeConfig = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
-    return createStore(wrapModel, _object_spread({}, config2, storeConfig));
+    return createStore(wrapModel, _object_spread({}, config3, storeConfig));
   };
   wrapModel.extends = function extendsKey(e) {
     return Object.assign(wrapModel, e);
@@ -1357,18 +1353,18 @@ function createKey(model2) {
 }
 createKey.isModelKey = isModelKey;
 function createStores(modelKeys) {
-  var config2 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+  var config3 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
   var state = {
     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;
-    return createStore(k, "defaultState" in k ? _object_spread_props(_object_spread({}, config2), {
+    var k = typeof modelKey === "function" ? modelKey : modelKey.key;
+    return createStore(k, "defaultState" in k ? _object_spread_props(_object_spread({}, config3), {
       state: k.defaultState
-    }) : config2);
+    }) : config3);
   });
   return {
     find: function find(key) {
@@ -1418,28 +1414,28 @@ function createStores(modelKeys) {
 }
 
 // src/model/index.ts
-function configModel(config2) {
-  var model2 = function model3(modelFn, wrapper) {
+function configModel(config3) {
+  var model = function model2(modelFn, wrapper) {
     var currentSelector = wrapper !== null && wrapper !== void 0 ? wrapper : defaultSelector;
     var modelWrapper = function modelWrapper2(state) {
       return modelFn(state);
     };
     modelWrapper.produce = function produce(s) {
-      return model3(modelFn, s);
+      return model2(modelFn, s);
     };
     modelWrapper.createKey = function createModelKey(state) {
-      return createKey(modelFn, arguments.length ? _object_spread_props(_object_spread({}, config2), {
+      return createKey(modelFn, arguments.length ? _object_spread_props(_object_spread({}, config3), {
         state,
         wrapper: currentSelector
-      }) : _object_spread_props(_object_spread({}, config2), {
+      }) : _object_spread_props(_object_spread({}, config3), {
         wrapper: currentSelector
       }));
     };
     modelWrapper.createStore = function createModelStore(state) {
-      return createStore(modelFn, arguments.length ? _object_spread_props(_object_spread({}, config2), {
+      return createStore(modelFn, arguments.length ? _object_spread_props(_object_spread({}, config3), {
         state,
         wrapper: currentSelector
-      }) : _object_spread_props(_object_spread({}, config2), {
+      }) : _object_spread_props(_object_spread({}, config3), {
         wrapper: currentSelector
       }));
     };
@@ -1450,46 +1446,41 @@ function configModel(config2) {
     modelWrapper.modelUsageIdentifier = modelUsageIdentifier;
     return modelWrapper;
   };
-  model2.createField = createField2;
-  model2.createMethod = createMethod2;
-  return model2;
+  model.createField = createField2;
+  model.createMethod = createMethod2;
+  return model;
 }
 
 // src/index.ts
-function config() {
+var config = function config2() {
   var configuration = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
-  var createStore3 = function createStore4(modelLike, state) {
+  var createStore2 = function createStore3(modelLike, state) {
     return createStore(modelLike, arguments.length > 1 ? _object_spread_props(_object_spread({}, configuration), {
       state
     }) : configuration);
   };
-  var createKey3 = function createKey4(model3, state) {
+  var createKey2 = function createKey3(model2, state) {
     var isKeySetState = arguments.length > 1;
-    var key = createKey(model3, isKeySetState ? _object_spread_props(_object_spread({}, configuration), {
+    var key = createKey(model2, isKeySetState ? _object_spread_props(_object_spread({}, configuration), {
       state
     }) : configuration);
     key.createStore = function createKeyStore(s) {
-      return arguments.length > 0 ? createStore3(key, s) : createStore3(key);
+      return arguments.length > 0 ? createStore2(key, s) : createStore2(key);
     };
     return key;
   };
-  createKey3.isModelKey = createKey.isModelKey;
-  var createStores3 = function createStores4() {
+  createKey2.isModelKey = createKey.isModelKey;
+  var createStores2 = function createStores3() {
     for (var _len = arguments.length, modelKeys = new Array(_len), _key = 0; _key < _len; _key++) {
       modelKeys[_key] = arguments[_key];
     }
     return createStores(modelKeys, configuration);
   };
-  var model2 = configModel(configuration);
+  var model = configModel(configuration);
   return {
-    createStore: createStore3,
-    createKey: createKey3,
-    createStores: createStores3,
-    model: model2
+    createStore: createStore2,
+    createKey: createKey2,
+    createStores: createStores2,
+    model
   };
-}
-var _config = config();
-var createStore2 = _config.createStore;
-var createKey2 = _config.createKey;
-var createStores2 = _config.createStores;
-var model = _config.model;
+};

package/esm/index.js

@@ -20,48 +20,43 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { createStore as cs } from "./store";
 import { createKey as ck, createStores as css } from "./key";
 import { configModel } from "./model";
-function config(configuration = {}) {
-  const createStore2 = function createStore3(modelLike, state) {
+const config = function config2(configuration = {}) {
+  const createStore = function createStore2(modelLike, state) {
     return cs(
       modelLike,
       arguments.length > 1 ? __spreadProps(__spreadValues({}, configuration), { state }) : configuration
     );
   };
-  const createKey2 = function createKey3(model3, state) {
+  const createKey = function createKey2(model2, state) {
     const isKeySetState = arguments.length > 1;
     const key = ck(
-      model3,
+      model2,
       isKeySetState ? __spreadProps(__spreadValues({}, configuration), { state }) : configuration
     );
     key.createStore = function createKeyStore(s) {
-      return arguments.length > 0 ? createStore2(key, s) : createStore2(key);
+      return arguments.length > 0 ? createStore(key, s) : createStore(key);
     };
     return key;
   };
-  createKey2.isModelKey = ck.isModelKey;
-  const createStores2 = function createStores3(...modelKeys) {
+  createKey.isModelKey = ck.isModelKey;
+  const createStores = function createStores2(...modelKeys) {
     return css(modelKeys, configuration);
   };
-  const model2 = configModel(configuration);
+  const model = configModel(configuration);
   return {
-    createStore: createStore2,
-    createKey: createKey2,
-    createStores: createStores2,
-    model: model2
+    createStore,
+    createKey,
+    createStores,
+    model
   };
-}
-const { createStore, createKey, createStores, model } = config();
+};
 import { createSignal, createSelector } from "./store";
 import { validations } from "./validation";
 import { shallowEqual } from "./tools";
 export {
   config,
-  createKey,
   createSelector,
   createSignal,
-  createStore,
-  createStores,
-  model,
   shallowEqual,
   validations
 };

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

@@ -117,12 +117,6 @@ export declare interface Store<
   extends: <E extends Record<string, any>>(e: E) => Store<M, R> & E;
 }
 
-export declare function createStore<
-  M extends Model,
-  D extends PickState<M>,
-  R extends undefined | ((instance: () => Instance<M>) => any) = undefined
->(model: M | Key<M, R> | ModelUsage<M, R>, state?: D): Store<M, R>;
-
 /** createKey * */
 
 export declare interface ModelKey<
@@ -133,12 +127,6 @@ export declare interface ModelKey<
   extends: <E extends Record<string, any>>(e: E) => ModelKey<M, R> & E;
 }
 
-export declare function createKey<
-  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>;
-
 /** createStores * */
 
 export declare interface StoreCollection {
@@ -153,10 +141,6 @@ export declare interface StoreCollection {
   destroy: () => void;
 }
 
-export declare function createStores(
-  ...modelKeys: (ModelKey<any, any> | StoreIndex<any, any>)[]
-): StoreCollection;
-
 /** model API * */
 
 export declare type ModelUsage<
@@ -177,7 +161,7 @@ export declare type ModelUsage<
 };
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-export declare interface model {
+declare interface model {
   <M extends Model>(modelFn: M): ModelUsage<M, undefined>;
   <M extends Model, R extends (instance: () => Instance<M>) => any>(
     modelFn: M,

package/package.json

@@ -1,68 +1,68 @@
-{
-  "private": false,
-  "name": "as-model",
-  "version": "0.3.3",
-  "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.4.0",
+  "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"
+  ]
+}