simple-boot-front 1.0.106 → 1.0.109

package/SimpleBootFront.d.ts

@@ -27,7 +27,7 @@ export declare class SimpleBootFront extends SimpleApplication {
     writeRootRouter(): SimAtomic<any>;
     goRouting(url: string): Promise<RouterModule<SimAtomic<Object>, any>>;
     runRouting(otherInstanceSim?: Map<ConstructorType<any>, any>, url?: string): Promise<RouterModule<SimAtomic<Object>, any> | undefined>;
-    run(otherInstanceSim?: Map<ConstructorType<any>, any>, url?: string): void;
+    run(otherInstanceSim?: Map<ConstructorType<any>, any>, url?: string): SimstanceManager;
     private afterSetting;
     initDomRenderScripts(): void;
     private initDomRenderTargetElements;

package/SimpleBootFront.js

@@ -75,7 +75,8 @@ 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/RawSet");
+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 SimpleBootFront = (function (_super) {
@@ -162,7 +163,7 @@ var SimpleBootFront = (function (_super) {
     SimpleBootFront.prototype.getComponentInnerHtml = function (targetObj, id) {
         var _a, _b;
         var component = (0, Component_1.getComponent)(targetObj);
-        var styles = RawSet_1.RawSet.styleTransformLocal((_a = component === null || component === void 0 ? void 0 : component.styles) !== null && _a !== void 0 ? _a : [], id);
+        var styles = RawSet_1.RawSet.generateStyleTransform((_a = component === null || component === void 0 ? void 0 : component.styles) !== null && _a !== void 0 ? _a : [], id);
         var template = ((_b = component === null || component === void 0 ? void 0 : component.template) !== null && _b !== void 0 ? _b : '');
         return styles + template;
     };
@@ -175,7 +176,7 @@ var SimpleBootFront = (function (_super) {
     };
     SimpleBootFront.prototype.initRun = function (otherInstanceSim) {
         var _this = this;
-        _super.prototype.run.call(this, otherInstanceSim);
+        var simstanceManager = _super.prototype.run.call(this, otherInstanceSim);
         this.initDomRenderScripts();
         this.initDomRenderTargetElements();
         this.navigation = this.simstanceManager.getOrNewSim(Navigation_1.Navigation);
@@ -190,6 +191,7 @@ var SimpleBootFront = (function (_super) {
                 _this.afterSetting();
             });
         });
+        return simstanceManager;
     };
     SimpleBootFront.prototype.initWriteRootRouter = function () {
         var _a;
@@ -203,13 +205,14 @@ var SimpleBootFront = (function (_super) {
         }
     };
     SimpleBootFront.prototype.writeRootRouter = function () {
-        var _a, _b, _c;
         var routerAtomic = new SimAtomic_1.SimAtomic(this.rootRouter, this.getSimstanceManager());
         var target = this.option.window.document.querySelector(this.option.selector);
         if (target && routerAtomic.value) {
-            var component = routerAtomic.getConfig(Component_1.ComponentMetadataKey);
-            var styles = ((_b = (_a = component === null || component === void 0 ? void 0 : component.styles) === null || _a === void 0 ? void 0 : _a.map(function (it) { return "<style>".concat(it, "</style>"); })) !== null && _b !== void 0 ? _b : []).join(' ');
-            target.innerHTML = "".concat(styles, " ").concat((_c = component === null || component === void 0 ? void 0 : component.template) !== null && _c !== void 0 ? _c : '');
+            var id = 'root-router';
+            var startEndPoint = RawSet_1.RawSet.createStartEndPoint(id, RawSetType_1.RawSetType.TARGET_ELEMENT, this.domRenderConfig);
+            target.appendChild(startEndPoint.start);
+            target.insertAdjacentHTML('beforeend', this.getComponentInnerHtml(this.rootRouter, id));
+            target.appendChild(startEndPoint.end);
         }
         return routerAtomic;
     };
@@ -234,11 +237,11 @@ var SimpleBootFront = (function (_super) {
     SimpleBootFront.prototype.runRouting = function (otherInstanceSim, url) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var intent, data;
+            var simstanceManager, intent, data;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        this.initRun(otherInstanceSim);
+                        simstanceManager = this.initRun(otherInstanceSim);
                         if (url) {
                             this.navigation.goNoPopStateEvent(url);
                         }
@@ -253,11 +256,12 @@ var SimpleBootFront = (function (_super) {
         });
     };
     SimpleBootFront.prototype.run = function (otherInstanceSim, url) {
-        this.initRun(otherInstanceSim);
+        var simstanceManager = this.initRun(otherInstanceSim);
         if (url) {
             this.navigation.go(url);
         }
         this.option.window.dispatchEvent(new Event('popstate'));
+        return simstanceManager;
     };
     SimpleBootFront.prototype.afterSetting = function () {
         var _this = this;

package/lifecycle/OnInit.d.ts

@@ -1,4 +1,4 @@
-import { RawSet } from 'dom-render/RawSet';
+import { RawSet } from 'dom-render/rawsets/RawSet';
 export declare type OnInitParameter = {
     makerObj: any;
     rawSet: RawSet;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "simple-boot-front",
-  "version": "1.0.106",
+  "version": "1.0.109",
   "main": "SimpleApplication.js",
   "license": "MIT",
   "description": "front end SPA frameworks",
@@ -72,7 +72,7 @@
     "typescript": "^4.4.3"
   },
   "dependencies": {
-    "dom-render": "^1.0.86",
-    "simple-boot-core": "^1.0.31"
+    "dom-render": "^1.0.87",
+    "simple-boot-core": "^1.0.32"
   }
 }

package/script/ScriptRunnable.d.ts

@@ -1,5 +1,5 @@
 import { Runnable } from 'simple-boot-core/run/Runnable';
-import { RawSet } from 'dom-render/RawSet';
+import { RawSet } from 'dom-render/rawsets/RawSet';
 export declare abstract class ScriptRunnable implements Runnable {
     rawSets: Map<RawSet, any>;
     render(): void;