buildz 0.4.91__tar.gz → 0.5.1__tar.gz

{buildz-0.4.91/buildz.egg-info → buildz-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.4.91
+Version: 0.5.1
 Summary: a json-base file format's read and write code by python, and codes to read and product object from configure file in such format
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

buildz-0.5.1/buildz/ioc/ioc/base.py

@@ -0,0 +1,61 @@
+#coding=utf-8
+from buildz import xf, pyz
+from buildz.xf import g as xg
+import json
+import builtins
+typez = builtins.type
+class IOCError(Exception):
+    def __init__(self, msg):
+        super().__init__(msg)
+
+pass
+class Base:
+    def update_maps(self, maps, src, replace=1):
+        xf.deep_update(maps, src, replace)
+    def __init__(self, *args, **maps):
+        self.init(*args, **maps)
+    def init(self, *args, **maps):
+        pass
+    def __call__(self, *args, **maps):
+        return self.deal(*args, **maps)
+    def deal(self, *args, **maps):
+        return None
+
+pass
+class EncapeData(Base):
+    """
+        包含data id对应的配置，配置文件id，配置文件对象
+        [object.test, call, ]
+    """
+    def __init__(self, data, conf, local = False, type = None, src = None, info = None):
+        """
+            data: 配置数据
+            conf: 配置数据对应的配置文件的管理器
+            local: 是否是locals的数据（配置文件局部数据）
+            type: 配置数据的type字段
+            src: 源对象，配置数据生成的对象调用conf获取对象，会有这个字段，目前只有object会放这个字段，其他要么透传要么不传
+            info: 额外的调用信息，目前只有object会用到里面的id字段，作为单例额外输入
+        """
+        if typez(data)==dict:
+            pid = xf.g(data, parent=None)
+            if pid is not None:
+                pedt = conf.get_data(pid, local=True, search_confs = True,src = src, info = info)
+                if pedt is None:
+                    raise IOCError("unfind parend: "+pid)
+                pdt = pedt.data
+                if typez(pdt)!=dict:
+                    raise IOCError("only dict can be a parent: "+pid)
+                data = dict(data)
+                self.update_maps(data, pdt, replace=0)
+        self.data = data
+        self.sid = conf.id
+        self.src = src
+        self.conf = conf
+        self.confs = conf.confs
+        self.local = local
+        if type is None:
+            type = conf.confs.get_data_type(data, 0, conf.default_type())
+        self.type = type
+        self.info = info
+
+pass

{buildz-0.4.91 → buildz-0.5.1}/buildz/ioc/ioc/conf.py

@@ -2,7 +2,7 @@
 from buildz import xf, pyz
 from buildz.xf import g as xg
 import json
-from .base import Base, EncapeData
+from .base import Base, EncapeData,IOCError
 class Conf(Base):
     """
         配置文件格式：
@@ -33,6 +33,12 @@ class Conf(Base):
                     item_conf,
                     ...
                 ]
+                // 初始化，会一个一个get(id)
+                // 其他地方调用该conf.get的时候，会先判断有没有进行init，没有就先调init里的get
+                inits: [
+                    id,
+                    ...
+                ]
             }
         如果只有全局数据配置项，可以只写datas里的东西:
             [
@@ -63,7 +69,7 @@ class Conf(Base):
             }
         """
         if type(conf)!=dict:
-            conf = {'data':conf}
+            conf = {'datas':conf}
         id = xf.g(conf, id=None)
         if id is None:
             id = confs.conf_id()
@@ -74,6 +80,7 @@ class Conf(Base):
         self.locals = self.map(xf.g(conf, locals=[]), self.confs.get_data_id)
         self.datas = self.map(xf.g(conf, datas=[]), self.confs.get_data_id)
         self.deals = self.map(xf.g(conf, deals = []), self.confs.get_deal_type)
+        self.inits = xf.g(conf, inits = [])
         self._default_type = xf.g(conf, default_type = None)
         self.envs = xf.g(conf, envs = {})
         self.confs.flush_env(self.envs)
@@ -97,6 +104,13 @@ class Conf(Base):
             aliases = xf.g(conf, aliases = [])
             for alias in aliases:
                 self.deals[alias] = deal
+        self.mark_init = False
+    def do_init(self):
+        if self.mark_init:
+            return
+        self.mark_init = True
+        for id in self.inits:
+            self.get(id)
     def get_env(self, id, search_confs = True):
         if self.confs.global_env and search_confs:
             return self.confs.get_env(id, self.id)
@@ -116,6 +130,9 @@ class Conf(Base):
         if not search_confs:
             return None
         return self.confs.get_env(id, self.id)
+    def set_deal(self, type, fc):
+        self.deals[type] = fc
+        self.confs.set_deal(type, fc)
     def get_deal(self, type, search_confs = True):
         if self.confs.global_deal and search_confs:
             return self.confs.get_deal(type, self.id)
@@ -125,6 +142,7 @@ class Conf(Base):
             return None
         return self.confs.get_deal(type, self.id)
     def get_data(self, id, local = True, search_confs = True, src = None, info = None):
+        self.do_init()
         if id in self.datas:
             obj = self.datas[id]
             return EncapeData(obj, self, local = False, src=src, info = info)
@@ -148,9 +166,11 @@ class Conf(Base):
         """
         conf = self.get_data(id, src = src, info = info)
         if conf is None:
+            raise IOCError(f"can't find conf of {id}")
             return None
         deal = self.get_deal(conf.type)
         if deal is None:
+            raise IOCError(f"can't find deal of {id}, type = {conf.type}")
             return None
         if not remove:
             obj = deal(conf)

{buildz-0.4.91 → buildz-0.5.1}/buildz/ioc/ioc/confs.py

@@ -3,7 +3,7 @@ from buildz import xf, pyz
 from buildz.xf import g as xg
 from buildz import argx
 import json
-from .base import Base, EncapeData
+from .base import Base, EncapeData,IOCError
 from .conf import Conf
 import os
 class ConfsNode(Base):
@@ -220,6 +220,13 @@ class Confs(Base):
         self.deals = {}
         self.envs = {}
         self.envs_args = None
+        self.mark_init = False
+    def do_init(self):
+        if self.mark_init:
+            return
+        self.mark_init = True
+        for id in self.confs:
+            self.confs[id].do_init()
     def get_deal_type(self, obj):
         if type(obj)==dict:
             return obj[self.deal_key_type]
@@ -306,11 +313,14 @@ class Confs(Base):
         """
             根据data id获取data对象，处理逻辑：根据data id查配置，根据配置的type查deal，返回deal处理过的配置
         """
+        self.do_init()
         conf = self.get_data(id, sid, src=src, info = info)
         if conf is None:
+            raise IOCError(f"confs: can't find conf of {id}")
             return None
         deal = self.get_deal(conf.type, sid)
         if deal is None:
+            raise IOCError(f"confs: can't find deal of {id}, type = {conf.type}")
             return None
         #print(f"get_obj: {id}({sid}), conf: {conf}, deal: {deal}, type: {conf.type}")
         if not remove:

buildz-0.5.1/buildz/ioc/ioc_deal/conf/deal_lists.js

@@ -0,0 +1,22 @@
+// [[id, type, single], source, construct=[args, maps], sets=[]]
+[
+    {
+        nullable: 0,
+        out: 1,
+        conf: {
+            sort: -1,
+            data:[
+                {key: id, default: null},
+                {key: type, default: null}
+            ]
+        }
+    },
+    {
+        nullable: 0,
+        key: target
+    },
+    {
+        nullable: 0,
+        key: source
+    }
+]

{buildz-0.4.91 → buildz-0.5.1}/buildz/ioc/ioc_deal/conf/deals.js

@@ -9,7 +9,8 @@
         {
             type: object,
             note: 对象,
-            build: buildz.ioc.ioc_deal.obj.ObjectDeal
+            build: buildz.ioc.ioc_deal.obj.ObjectDeal,
+            aliases: [obj]
         },
         {
             type: env,
@@ -65,6 +66,17 @@
             type: join,
             note: 文件路径拼接,
             build: buildz.ioc.ioc_deal.join.JoinDeal
+        },
+        {
+            type: xfile,
+            note: xf配置文件读取,
+            build: buildz.ioc.ioc_deal.xfile.XfileDeal,
+            aliases: [xf]
+        },
+        {
+            type: deal,
+            note: 扩展的自定义deal方法,
+            build: buildz.ioc.ioc_deal.deal.DealDeal
         }
     ]
 }

buildz-0.5.1/buildz/ioc/ioc_deal/conf/xfile_defaults.js

@@ -0,0 +1,2 @@
+{
+}

buildz-0.5.1/buildz/ioc/ioc_deal/conf/xfile_lists.js

@@ -0,0 +1,22 @@
+// [[id, type, single], source, construct=[args, maps], sets=[]]
+[
+    {
+        nullable: 0,
+        out: 1,
+        conf: {
+            sort: -1,
+            data:[
+                {key: id, default: null},
+                {key: type, default: null}
+            ]
+        }
+    },
+    {
+        nullable: 1,
+        key: filepath
+    },
+    {
+        nullable: 1,
+        key: fp
+    }
+]

buildz-0.5.1/buildz/ioc/ioc_deal/deal.py

@@ -0,0 +1,40 @@
+#coding=utf-8
+from ..ioc.base import Base, EncapeData,IOCError
+from .base import FormatData,BaseDeal
+from buildz import xf, pyz
+import os
+dp = os.path.dirname(__file__)
+join = os.path.join
+class DealDeal(BaseDeal):
+    """
+        // 调用后会注册到conf的deal上，用于扩展deals配置
+        deal字段deal:
+            {
+                id:id
+                type: deal
+                target: type
+                source: id # 要求source实现了方法__call__(self, edata:EncapeData)
+            }
+        简写:
+            [[id, deal], target, source]
+            [deal, target, source]
+        例:
+            [deal, target, source] //
+    """
+    def init(self, fp_lists=None, fp_defaults=None):
+        super().init("DealDeal", fp_lists, fp_defaults, join(dp, "conf", "deal_lists.js"), None)
+    def deal(self, edata:EncapeData):
+        data = edata.data
+        source = xf.g(data, source=None)
+        if source is None:
+            raise IOCError("not source in dealdeal")
+        target = xf.g(data, target=None)
+        if target is None:
+            raise IOCError("not target in dealdeal")
+        obj = edata.conf.get(source)
+        if obj is None:
+            raise IOCError("source object not found in dealdeal")
+        edata.conf.set_deal(target, obj)
+        return None
+
+pass

{buildz-0.4.91 → buildz-0.5.1}/buildz/ioc/ioc_deal/obj.py

@@ -1,5 +1,5 @@
 #
-from ..ioc.base import Base, EncapeData
+from ..ioc.base import Base, EncapeData,IOCError
 from .base import FormatData,BaseDeal
 from buildz import xf, pyz
 import os
@@ -12,7 +12,9 @@ class ObjectDeal(BaseDeal):
                 id: id
                 type: object
                 source: 导入路径+调用方法/类
-                single: 1 //是否单例，默认是
+                single: 1 //是否单例，默认是，
+                        //这里的单例是一个id对应一个实例，
+                        //如果两个id用的同一个source，就是同一个source的两个对象
                 // 构造函数
                 construct:{
                     args: [
@@ -24,6 +26,15 @@ class ObjectDeal(BaseDeal):
                         ...
                     }
                 }
+                //construct和args+maps，不能同时存在
+                args: [
+                    item_conf,
+                    ...
+                ]
+                maps: {
+                    key1: item_conf,
+                    ...
+                }
                 // sets之前调用方法
                 prev_call: item_conf
                 // 对象变量设置属性
@@ -98,13 +109,18 @@ class ObjectDeal(BaseDeal):
         if ids is not None:
             obj = xf.gets(self.singles, ids)
             if obj is not None:
+                #raise IOCError(f"null for {ids}")
                 return obj
         source = xf.g(data, source=0)
         fc = xf.get(self.sources, source, None)
         if fc is None:
             fc = pyz.load(source)
             self.sources[source]=fc
-        cst = xf.g(data, construct = [])
+        cst = xf.g(data, construct = None)
+        if cst is None:
+            _args = xf.g(data, args = [])
+            _maps = xf.g(data, maps = {})
+            cst = [_args, _maps]
         cst = self.fmt_cst(cst)
         args = xf.g(cst, args=[])
         maps = xf.g(cst, maps={})

buildz-0.5.1/buildz/ioc/ioc_deal/xfile.py

@@ -0,0 +1,41 @@
+#
+from ..ioc.base import Base, EncapeData
+from .base import FormatData,BaseDeal
+from buildz import xf, pyz
+import os
+dp = os.path.dirname(__file__)
+join = os.path.join
+class XfileDeal(BaseDeal):
+    """
+    配置文件载入xfile/xf:
+        {
+            id:id
+            type:xfile
+            filepath: fp 
+            # or fp: fp
+        }
+    简写:
+        [[id, xfile], fp]
+        [xfile, fp]
+        [xf, fp]
+    例:
+        [xfile, test.js]
+    """
+    def init(self, fp_lists = None, fp_defaults = None):
+        self.singles = {}
+        self.sources = {}
+        super().init("XfileDeal", fp_lists, fp_defaults, 
+            join(dp, "conf", "xfile_lists.js"),
+            join(dp, "conf", "xfile_defaults.js"))
+    def deal(self, edata:EncapeData):
+        sid = edata.sid
+        data = edata.data
+        conf = edata.conf
+        data = self.format(data)
+        fp = xf.g(data, filepath=None)
+        if fp is None:
+            fp = xf.g(data, fp = fp)
+        rst = xf.loads(xf.fread(fp))
+        return rst
+
+pass

{buildz-0.4.91 → buildz-0.5.1}/buildz/pyz.py

@@ -15,7 +15,7 @@ def load(md, fc = None):
         try:
             md = __import__(".".join(mds))
             break
-        except:
+        except ModuleNotFoundError as exp:
             mds = mds[:-1]
     if len(mds)==0:
         raise Exception("can't import package from "+md)

{buildz-0.4.91 → buildz-0.5.1}/buildz/xf/mapz.py

@@ -88,7 +88,7 @@ def deep_update(target, src, replace=1):
             continue
         mval = target[k]
         if type(mval) == dict and type(val)==dict:
-            update_maps(mval, val, replace)
+            deep_update(mval, val, replace)
         else:
             if replace:
                 target[k] = val

{buildz-0.4.91 → buildz-0.5.1}/buildz/xf/readz.py

@@ -43,8 +43,8 @@ def build_val(mgs):
     mgs.add(reval.ValDeal("false", lambda x:False))
 
 pass
-def build():
-    mgs = mg.Manager()
+def build(as_bytes=False):
+    mgs = mg.Manager(as_bytes)
     build_val(mgs)
     mgs.add(strz.PrevStrDeal("r'''","'''",0,0,0))
     mgs.add(strz.PrevStrDeal('r"""','"""',0,0,0))
@@ -71,11 +71,11 @@ def build():
     return mgs
 
 pass
-def load(read):
-    mgs = build()
+def load(read, as_bytes = False):
+    mgs = build(as_bytes)
     return msg.loads(read)
 def loads(s):
-    mgs = build()
+    mgs = build(type(s)==bytes)
     input = buffer.BufferInput(s)
     return mgs.loads(s)
 

{buildz-0.4.91 → buildz-0.5.1/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.4.91
+Version: 0.5.1
 Summary: a json-base file format's read and write code by python, and codes to read and product object from configure file in such format
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.4.91 → buildz-0.5.1}/buildz.egg-info/SOURCES.txt

@@ -42,6 +42,7 @@ buildz/ioc/ioc/confs.py
 buildz/ioc/ioc_deal/base.py
 buildz/ioc/ioc_deal/call.py
 buildz/ioc/ioc_deal/calls.py
+buildz/ioc/ioc_deal/deal.py
 buildz/ioc/ioc_deal/demo.py
 buildz/ioc/ioc_deal/env.py
 buildz/ioc/ioc_deal/ioc.py
@@ -54,10 +55,12 @@ buildz/ioc/ioc_deal/ovar.py
 buildz/ioc/ioc_deal/ref.py
 buildz/ioc/ioc_deal/val.py
 buildz/ioc/ioc_deal/var.py
+buildz/ioc/ioc_deal/xfile.py
 buildz/ioc/ioc_deal/conf/call_defaults.js
 buildz/ioc/ioc_deal/conf/call_lists.js
 buildz/ioc/ioc_deal/conf/calls_defaults.js
 buildz/ioc/ioc_deal/conf/calls_lists.js
+buildz/ioc/ioc_deal/conf/deal_lists.js
 buildz/ioc/ioc_deal/conf/deals.js
 buildz/ioc/ioc_deal/conf/env_lists.js
 buildz/ioc/ioc_deal/conf/ioc_lists.js
@@ -73,6 +76,8 @@ buildz/ioc/ioc_deal/conf/obj_set_lists.js
 buildz/ioc/ioc_deal/conf/ovar_lists.js
 buildz/ioc/ioc_deal/conf/ref_lists.js
 buildz/ioc/ioc_deal/conf/var_lists.js
+buildz/ioc/ioc_deal/conf/xfile_defaults.js
+buildz/ioc/ioc_deal/conf/xfile_lists.js
 buildz/tz/__init__.py
 buildz/tz/myers_diff.py
 buildz/xf/__init__.py

{buildz-0.4.91 → buildz-0.5.1}/setup.py

@@ -7,7 +7,7 @@ from setuptools import setup, find_packages
 
 setup(
     name = 'buildz',
-    version = '0.4.91',
+    version = '0.5.1',
     keywords='buildz',
     long_description=open('README.md', 'r', encoding="utf-8").read(),
     long_description_content_type='text/markdown',

buildz-0.4.91/buildz/ioc/ioc/base.py

@@ -1,35 +0,0 @@
-#coding=utf-8
-from buildz import xf, pyz
-from buildz.xf import g as xg
-import json
-class Base:
-    def update_maps(self, maps, src):
-        xf.deep_update(maps, src)
-    def __init__(self, *args, **maps):
-        self.init(*args, **maps)
-    def init(self, *args, **maps):
-        pass
-    def __call__(self, *args, **maps):
-        return self.deal(*args, **maps)
-    def deal(self, *args, **maps):
-        return None
-
-pass
-class EncapeData(Base):
-    """
-        包含data id对应的配置，配置文件id，配置文件对象
-        [object.test, call, ]
-    """
-    def __init__(self, data, conf, local = False, type = None, src = None, info = None):
-        self.data = data
-        self.sid = conf.id
-        self.src = src
-        self.conf = conf
-        self.confs = conf.confs
-        self.local = local
-        if type is None:
-            type = conf.confs.get_data_type(data, 0, conf.default_type())
-        self.type = type
-        self.info = info
-
-pass