simple-boot-front 1.0.101 → 1.0.104

package/README.MD

@@ -30,20 +30,20 @@ npm start
 # directory structure
 ```
 ┌─ assets
-├──dist (out put directory)
-├──src (source)
-│    ├──pages (your pages)
+├─ dist (out put directory)
+├─ src (source)
+│    ├─ pages (your pages)
 │    │     ├ home.ts (sample page)
 │    │     └ user.ts (sample page)
-│    ├──index.css (index route page css)
-│    ├──index.html (index route page template)
-│    └──index.ts (simple-boot-fornt start and route point)
-├──types (typescript type)
+│    ├─ index.css (index route page css)
+│    ├─ index.html (index route page template)
+│    └─ index.ts (simple-boot-fornt start and route point)
+├─ types (typescript type)
 │    └ index.d.ts (type definition)
-├──index.html start (point html)
-├──package.json (project config)
-├──rollup.config.js (rollup bundler config)
-└──tsconfig.json (typescript config)
+├─ index.html start (point html)
+├─ package.json (project config)
+├─ rollup.config.js (rollup bundler config)
+└─ tsconfig.json (typescript config)
 ```
 
 ## source 

package/SimpleBootFront.d.ts

@@ -21,9 +21,11 @@ export declare class SimpleBootFront extends SimpleApplication {
     getComponentInnerHtml(targetObj: any): string;
     createDomRender<T extends object>(obj: T): T;
     private initRun;
+    initWriteRootRouter(): void;
+    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): SimpleBootFront;
+    run(otherInstanceSim?: Map<ConstructorType<any>, any>, url?: string): void;
     private afterSetting;
     initDomRenderScripts(): void;
     private initDomRenderTargetElements;

package/SimpleBootFront.js

@@ -88,6 +88,7 @@ var SimpleBootFront = (function (_super) {
         _this.domRenderTargetElements = [];
         _this.domRenderTargetAttrs = [];
         _this.domRenderConfig = {
+            routerType: 'none',
             window: option.window,
             targetElements: _this.domRenderTargetElements,
             targetAttrs: _this.domRenderTargetAttrs,
@@ -174,34 +175,44 @@ var SimpleBootFront = (function (_super) {
     };
     SimpleBootFront.prototype.initRun = function (otherInstanceSim) {
         var _this = this;
-        var _a, _b, _c, _d, _e;
         _super.prototype.run.call(this, otherInstanceSim);
         this.initDomRenderScripts();
         this.initDomRenderTargetElements();
         this.navigation = this.simstanceManager.getOrNewSim(Navigation_1.Navigation);
-        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 val = routerAtomic.value;
-            var domRenderProxy = val._DomRender_proxy;
-            domRenderProxy.initRender(target);
-            (_e = (_d = val) === null || _d === void 0 ? void 0 : _d.onInit) === null || _e === void 0 ? void 0 : _e.call(_d);
-        }
+        this.initWriteRootRouter();
         this.option.window.addEventListener('intent', function (event) {
             var cevent = event;
             _this.publishIntent(new Intent_1.Intent(cevent.detail.uri, cevent.detail.data, event));
         });
         this.option.window.addEventListener('popstate', function (event) {
-            var _a;
-            var intent = new Intent_1.Intent((_a = _this.navigation.url) !== null && _a !== void 0 ? _a : '');
+            var intent = new Intent_1.Intent(_this.navigation.url || '/');
             _this.routing(intent).then(function (it) {
                 _this.afterSetting();
             });
         });
     };
+    SimpleBootFront.prototype.initWriteRootRouter = function () {
+        var _a;
+        var routerAtomic = this.writeRootRouter();
+        var target = this.option.window.document.querySelector(this.option.selector);
+        if (target && routerAtomic && routerAtomic.value) {
+            var val = routerAtomic.value;
+            var domRenderProxy = val._DomRender_proxy;
+            domRenderProxy.initRender(target);
+            (_a = val === null || val === void 0 ? void 0 : val.onInit) === null || _a === void 0 ? void 0 : _a.call(val);
+        }
+    };
+    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 : '');
+        }
+        return routerAtomic;
+    };
     SimpleBootFront.prototype.goRouting = function (url) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
@@ -247,7 +258,6 @@ var SimpleBootFront = (function (_super) {
             this.navigation.go(url);
         }
         this.option.window.dispatchEvent(new Event('popstate'));
-        return this;
     };
     SimpleBootFront.prototype.afterSetting = function () {
         var _this = this;
@@ -311,7 +321,7 @@ var SimpleBootFront = (function (_super) {
             var items = RawSet_1.RawSet.createComponentTargetElement(name, function (e, obj, r) {
                 var 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.domRenderConfig);
+            }, component === null || component === void 0 ? void 0 : component.template, component === null || component === void 0 ? void 0 : component.styles, false, _this.domRenderConfig);
             _this.domRenderTargetElements.push(items);
         });
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "simple-boot-front",
-  "version": "1.0.101",
+  "version": "1.0.104",
   "main": "SimpleApplication.js",
   "license": "MIT",
   "description": "front end SPA frameworks",
@@ -49,16 +49,11 @@
   },
   "scripts": {
     "build": "rm -rf dist && tsc --outDir dist --declarationDir dist",
-    "dev:serve": "npm run serve --workspace=dev",
-    "dev-onepage:serve": "npm run serve --workspace=dev-onepage",
-    "npm-build": "rm -rf dist && tsc --outDir dist --declarationDir dist && cp package-prod.json dist/package.json && cp README.MD dist",
+    "npm-build": "rm -rf dist && mkdir dist && cp package-prod.json dist/package.json && cp README.MD dist && tsc --outDir dist --declarationDir dist",
     "npm-publish": "npm run npm-build && npm publish ./dist",
     "tsc": "tsc",
-    "setting:root-dist": "rm -rf ../dist-simple-boot-front && mkdirp ../dist-simple-boot-front && cp package-root-dist.json ../dist-simple-boot-front/package.json",
-    "tsc:root-dist": "npm run setting:root-dist && tsc --outDir ../dist-simple-boot-front --declarationDir ../dist-simple-boot-front",
-    "tsc:watch": "rm -rf ./dist && mkdir dist && cp package.json dist && tsc --watch --sourceMap true",
-    "tsc:watch:root-dist": "npm run setting:root-dist && tsc --outDir ../dist-simple-boot-front --declarationDir ../dist-simple-boot-front --watch --sourceMap true",
-    "tsc:watch:dev": "rm -rf ./dist && mkdir dist && cp package-dev.json dist && tsc --watch --sourceMap true",
+    "tsc:watch": "rm -rf ./dist && mkdir dist && cp package.json dist && tsc --watch --outDir dist --declarationDir dist --sourceMap true",
+    "build:ts:watch": "rm -rf ./dist && mkdir dist && cp package-prod.json dist/package.json && tsc --watch --outDir dist --declarationDir dist --sourceMap true",
     "test": "jest --detectOpenHandles --forceExit"
   },
   "alias": {},
@@ -77,7 +72,7 @@
     "typescript": "^4.4.3"
   },
   "dependencies": {
-    "dom-render": "^1.0.70",
-    "simple-boot-core": "^1.0.29"
+    "dom-render": "^1.0.75",
+    "simple-boot-core": "^1.0.30"
   }
 }

package/service/Navigation.js

@@ -95,7 +95,7 @@ var Navigation = (function () {
             this.option.window.history.pushState(data, title, path);
         }
         else if (SimFrontOption_1.UrlType.hash === this.option.urlType) {
-            path = '#' + path.substring(1);
+            path = '#' + path;
             this.option.window.history.pushState(data, title, path);
         }
     };