simple-boot-front 1.0.111 → 1.0.114

package/SimpleBootFront.js

@@ -74,11 +74,9 @@ var HttpService_1 = require("./service/HttpService");
 var SimstanceManager_1 = require("simple-boot-core/simstance/SimstanceManager");
 var IntentManager_1 = require("simple-boot-core/intent/IntentManager");
 var RouterManager_1 = require("simple-boot-core/route/RouterManager");
-var ScriptUtils_1 = require("dom-render/utils/script/ScriptUtils");
 var RawSet_1 = require("dom-render/rawsets/RawSet");
 var RawSetType_1 = require("dom-render/rawsets/RawSetType");
-var Types_1 = require("dom-render/types/Types");
-var InjectFrontSituationType_1 = require("./decorators/inject/InjectFrontSituationType");
+var ComponentSet_1 = require("dom-render/components/ComponentSet");
 var SimpleBootFront = (function (_super) {
     __extends(SimpleBootFront, _super);
     function SimpleBootFront(rootRouter, option) {
@@ -94,39 +92,8 @@ var SimpleBootFront = (function (_super) {
             targetElements: _this.domRenderTargetElements,
             targetAttrs: _this.domRenderTargetAttrs,
             onElementInit: function (name, obj, rawSet, targetElement) {
-                var _a, _b, _c;
-                var target = (_a = targetElement === null || targetElement === void 0 ? void 0 : targetElement.__render) === null || _a === void 0 ? void 0 : _a.component;
-                var targetKey = 'onInit';
-                var firstCheckMaker = [function (ownerObj, type, idx, saveInjectionConfig) {
-                        if (InjectFrontSituationType_1.InjectFrontSituationType.OPENER === (saveInjectionConfig === null || saveInjectionConfig === void 0 ? void 0 : saveInjectionConfig.config.situationType) && rawSet.point.thisVariableName) {
-                            return new Proxy(ScriptUtils_1.ScriptUtils.evalReturn(rawSet.point.thisVariableName, obj), new Types_1.DomRenderFinalProxy());
-                        }
-                    }];
-                if (rawSet.point.thisVariableName) {
-                    (_b = target === null || target === void 0 ? void 0 : target.onInit) === null || _b === void 0 ? void 0 : _b.call.apply(_b, __spreadArray([target], _this.simstanceManager.getParameterSim({ target: target, targetKey: targetKey, firstCheckMaker: firstCheckMaker }), false));
-                }
-                else {
-                    (_c = target === null || target === void 0 ? void 0 : target.onInit) === null || _c === void 0 ? void 0 : _c.call.apply(_c, __spreadArray([target], _this.simstanceManager.getParameterSim({ target: target, targetKey: targetKey, firstCheckMaker: firstCheckMaker }), false));
-                }
             },
             onAttrInit: function (attrName, attrValue, obj, rawSet) {
-                var _a, _b;
-                if (attrName === 'component') {
-                    var target_1 = ScriptUtils_1.ScriptUtils.evalReturn(attrValue, obj);
-                    var targetKey = 'onInit';
-                    var firstCheckMaker = [function (obj, type, idx, saveInjectionConfig) {
-                            var _a, _b;
-                            if (InjectFrontSituationType_1.InjectFrontSituationType.OPENER === (saveInjectionConfig === null || saveInjectionConfig === void 0 ? void 0 : saveInjectionConfig.config.situationType) && ((_a = target_1 === null || target_1 === void 0 ? void 0 : target_1.__domrender_component_new) === null || _a === void 0 ? void 0 : _a.creator)) {
-                                return (_b = target_1 === null || target_1 === void 0 ? void 0 : target_1.__domrender_component_new) === null || _b === void 0 ? void 0 : _b.creator;
-                            }
-                        }];
-                    if (rawSet.point.thisVariableName) {
-                        (_a = target_1 === null || target_1 === void 0 ? void 0 : target_1.onInit) === null || _a === void 0 ? void 0 : _a.call.apply(_a, __spreadArray([target_1], _this.simstanceManager.getParameterSim({ target: target_1, targetKey: targetKey, firstCheckMaker: firstCheckMaker }), false));
-                    }
-                    else {
-                        (_b = target_1 === null || target_1 === void 0 ? void 0 : target_1.onInit) === null || _b === void 0 ? void 0 : _b.call.apply(_b, __spreadArray([target_1], _this.simstanceManager.getParameterSim({ target: target_1, targetKey: targetKey, firstCheckMaker: firstCheckMaker }), false));
-                    }
-                }
             },
             scripts: { application: _this },
             applyEvents: [{
@@ -138,23 +105,28 @@ var SimpleBootFront = (function (_super) {
                         });
                     }
                 }],
-            proxyExcludeTyps: _this.domRendoerExcludeProxy
+            proxyExcludeTyps: _this.domRendoerExcludeProxy,
+            operatorAround: {
+                drThis: {
+                    before: function (data, operatorExecutor) {
+                        var _a, _b;
+                        if (data && !(data instanceof ComponentSet_1.ComponentSet) && operatorExecutor.elementSource.element.getAttribute("".concat(RawSet_1.RawSet.DR_THIS_NAME, ":type")) === 'outlet') {
+                            var component = (0, Component_1.getComponent)(data);
+                            if (component) {
+                                var styles = (_a = component === null || component === void 0 ? void 0 : component.styles) !== null && _a !== void 0 ? _a : [];
+                                var template = (_b = component === null || component === void 0 ? void 0 : component.template) !== null && _b !== void 0 ? _b : '';
+                                return new ComponentSet_1.ComponentSet(operatorExecutor, template, styles, { objPath: null });
+                            }
+                            else {
+                                return undefined;
+                            }
+                        }
+                        return data;
+                    }
+                }
+            }
         };
         _this.option.window.__dirname = 'simple-boot-front__dirname';
-        var targetAttribute = RawSet_1.RawSet.createComponentTargetAttribute('component', function (element, attrValue, obj, rawSet) {
-            return ScriptUtils_1.ScriptUtils.eval("return ".concat(attrValue), obj);
-        }, function (element, attrValue, obj, rawSet) {
-            if (attrValue) {
-                var targetObj = ScriptUtils_1.ScriptUtils.eval("return ".concat(attrValue), obj);
-                var n = element.cloneNode(true);
-                var innerHTML = _this.getComponentInnerHtml(targetObj, rawSet.uuid);
-                n.innerHTML = innerHTML;
-                return RawSet_1.RawSet.drThisCreate(rawSet, n, attrValue, '', true, obj, _this.option);
-            }
-            var fag = _this.option.window.document.createDocumentFragment();
-            return fag;
-        });
-        _this.domRenderTargetAttrs.push(targetAttribute);
         option.proxy = {
             onProxy: function (it) { return _this.createDomRender(it); }
         };
@@ -323,8 +295,14 @@ var SimpleBootFront = (function (_super) {
         var selectors = Component_1.componentSelectors;
         selectors.forEach(function (val, name) {
             var component = (0, Component_1.getComponent)(val);
-            var items = RawSet_1.RawSet.createComponentTargetElement(name, function (e, obj, r) {
-                var newSim = _this.simstanceManager.newSim(val);
+            var items = RawSet_1.RawSet.createComponentTargetElement(name, function (e, obj, r, counstructorParam) {
+                var newSim;
+                if (counstructorParam === null || counstructorParam === void 0 ? void 0 : counstructorParam.length) {
+                    newSim = new (val.bind.apply(val, __spreadArray([void 0], counstructorParam, false)))();
+                }
+                else {
+                    newSim = _this.simstanceManager.newSim(val);
+                }
                 return newSim;
             }, component === null || component === void 0 ? void 0 : component.template, component === null || component === void 0 ? void 0 : component.styles);
             _this.domRenderTargetElements.push(items);

package/decorators/Component.d.ts

@@ -7,5 +7,6 @@ export interface ComponentConfig {
     using?: (ConstructorType<any>)[];
 }
 export declare const ComponentMetadataKey: unique symbol;
-export declare const Component: (config?: ComponentConfig | undefined) => GenericClassDecorator<ConstructorType<any>>;
+export declare function Component(target: ConstructorType<any>): void;
+export declare function Component(config: ComponentConfig): GenericClassDecorator<ConstructorType<any>>;
 export declare const getComponent: (target: ConstructorType<any> | Function | any) => ComponentConfig | undefined;

package/decorators/Component.js

@@ -4,18 +4,23 @@ exports.getComponent = exports.Component = exports.ComponentMetadataKey = export
 var ReflectUtils_1 = require("simple-boot-core/utils/reflect/ReflectUtils");
 exports.componentSelectors = new Map();
 exports.ComponentMetadataKey = Symbol('Component');
-var Component = function (config) {
-    return function (target) {
-        if (!config) {
-            config = {};
-        }
-        if (!config.selector) {
-            config.selector = target.name;
-        }
-        ReflectUtils_1.ReflectUtils.defineMetadata(exports.ComponentMetadataKey, config, target);
-        exports.componentSelectors.set(config.selector.toLowerCase(), target);
-    };
+var componentProcess = function (config, target) {
+    if (!config.selector) {
+        config.selector = target.name.toLowerCase();
+    }
+    ReflectUtils_1.ReflectUtils.defineMetadata(exports.ComponentMetadataKey, config, target);
+    exports.componentSelectors.set(config.selector.toLowerCase(), target);
 };
+function Component(configOrTarget) {
+    if (typeof configOrTarget === 'function') {
+        componentProcess({}, configOrTarget);
+    }
+    else {
+        return function (target) {
+            componentProcess(configOrTarget, target);
+        };
+    }
+}
 exports.Component = Component;
 var getComponent = function (target) {
     if (target && typeof target === 'object') {

package/decorators/inject/InjectFrontSituationType.d.ts

@@ -1,3 +0,0 @@
-export declare enum InjectFrontSituationType {
-    OPENER = "SIMPLE_BOOT_FRONT://OPENER"
-}

package/decorators/inject/InjectFrontSituationType.js

@@ -1,7 +1 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.InjectFrontSituationType = void 0;
-var InjectFrontSituationType;
-(function (InjectFrontSituationType) {
-    InjectFrontSituationType["OPENER"] = "SIMPLE_BOOT_FRONT://OPENER";
-})(InjectFrontSituationType = exports.InjectFrontSituationType || (exports.InjectFrontSituationType = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "simple-boot-front",
-  "version": "1.0.111",
+  "version": "1.0.114",
   "main": "SimpleApplication.js",
   "license": "MIT",
   "description": "front end SPA frameworks",
@@ -72,7 +72,7 @@
     "typescript": "^4.4.3"
   },
   "dependencies": {
-    "dom-render": "^1.0.89",
-    "simple-boot-core": "^1.0.32"
+    "dom-render": "^1.0.91",
+    "simple-boot-core": "^1.0.35"
   }
 }