fix: build and refs issues (#10)

demo/i18n/i18n.ts

@@ -1,4 +1,4 @@
-import {l10n} from '@alwatr/i18n2';
+import {l10n} from '@alwatr/i18n';
 import {createLogger} from '@alwatr/logger';
 import {delay} from '@alwatr/util';
 const logger = createLogger('demo/l18n', true);

demo/index.html

@@ -16,11 +16,11 @@
       <li><a href="./logger/">Logger</a></li>
       <li><a href="./fetch/">Fetch</a></li>
       <li><a href="./signal/">Signal</a></li>
-      <li><a href="./signal2/simple/">Signal Simple</a></li>
-      <li><a href="./signal2/context/">Context Signal</a></li>
-      <li><a href="./signal2/multithread-context/">Signal multithread</a></li>
+      <li><a href="./signal/simple/">Signal Simple</a></li>
+      <li><a href="./signal/context/">Context Signal</a></li>
+      <li><a href="./signal/multithread-context/">Signal multithread</a></li>
       <li><a href="./router/">Router</a></li>
-      <li><a href="./router2/">Router2</a></li>
+      <li><a href="./router/">router</a></li>
       <li><a href="./font/">Font</a></li>
       <li><a href="./math/">Math</a></li>
       <li><a href="./icon/">Icon</a></li>

demo/router2/index.ts → demo/router/index.ts

@@ -1,4 +1,4 @@
-import {router} from '@alwatr/router2';
+import {router} from '@alwatr/router';
 import {renderState} from '@alwatr/util';
 
 type PageName = 'home' | 'about' | 'products' | 'product' | 'contact';

packages/demo-pwa/package.json

@@ -32,5 +32,11 @@
     "watch": "run-p watch:root watch:es serve",
     "watch:es": "yarn build:es --clean --watch --debug",
     "watch:root": "cd ../../ && yarn watch:ts"
+  },
+  "devDependencies": {
+    "@alwatr/fsm": "^2.0.0",
+    "@alwatr/logger": "^1.1.5",
+    "@alwatr/pwa-helper": "^1.1.2",
+    "@alwatr/signal": "^2.0.0"
   }
 }

packages/demo-pwa/src/share/app-navigation-context.ts

@@ -1,11 +1,11 @@
-import {AlwatrContextSignal} from '@alwatr/signal2';
+import {AlwatrContextSignal} from '@alwatr/signal';
 
 import {icons} from '../icons.js';
 
-import type {NavigationBarContent} from '@alwatr/ui-kit2/navigation-bar/navigation-bar.js';
-import type {NavigationDrawerContent} from '@alwatr/ui-kit2/navigation-drawer/navigation-drawer.js';
-import type {NavigationRailContent} from '@alwatr/ui-kit2/navigation-rail/navigation-rail.js';
-import type {CenterTopAppBarContent} from '@alwatr/ui-kit2/top-app-bar/center-top-app-bar.js';
+import type {NavigationBarContent} from '@alwatr/ui-kit/navigation-bar/navigation-bar.js';
+import type {NavigationDrawerContent} from '@alwatr/ui-kit/navigation-drawer/navigation-drawer.js';
+import type {NavigationRailContent} from '@alwatr/ui-kit/navigation-rail/navigation-rail.js';
+import type {CenterTopAppBarContent} from '@alwatr/ui-kit/top-app-bar/center-top-app-bar.js';
 
 export interface AppNavigationContext {
   navigationBar: NavigationBarContent;

packages/demo-pwa/src/ui/alwatr-pwa.ts

@@ -1,9 +1,9 @@
 import {AlwatrDynamicDirective, alwatrObserve, cache, directive, html, type PartInfo} from '@alwatr/fract';
-import {router, type RouteContext} from '@alwatr/router2';
-import {alwatrNavigationBar} from '@alwatr/ui-kit2/navigation-bar/navigation-bar.js';
-import {alwatrNavigationDrawer} from '@alwatr/ui-kit2/navigation-drawer/navigation-drawer.js';
-import {alwatrNavigationRail} from '@alwatr/ui-kit2/navigation-rail/navigation-rail.js';
-import {centerTopAppBar, type CenterTopAppBarContent} from '@alwatr/ui-kit2/top-app-bar/center-top-app-bar.js';
+import {router, type RouteContext} from '@alwatr/router';
+import {alwatrNavigationBar} from '@alwatr/ui-kit/navigation-bar/navigation-bar.js';
+import {alwatrNavigationDrawer} from '@alwatr/ui-kit/navigation-drawer/navigation-drawer.js';
+import {alwatrNavigationRail} from '@alwatr/ui-kit/navigation-rail/navigation-rail.js';
+import {centerTopAppBar, type CenterTopAppBarContent} from '@alwatr/ui-kit/top-app-bar/center-top-app-bar.js';
 import {renderState} from '@alwatr/util';
 
 import {alwatrPageTest} from './page-test.js';

packages/demo-pwa/tsconfig.json

@@ -17,13 +17,11 @@
   "include": ["src/**/*.ts"],
   "exclude": [],
   "references": [
-    {"path": "../../core/type"},
-    {"path": "../../core/util"},
-    {"path": "../../core/fract"},
-    {"path": "../../core/router2"},
-    {"path": "../../core/i18n2"},
-    {"path": "../../packages/ui-kit"},
-    {"path": "../../packages/ui-kit2"},
-    {"path": "../../packages/style"}
+    {"path": "../icon"},
+    {"path": "../fract"},
+    {"path": "../router"},
+    {"path": "../i18n"},
+    {"path": "../style"},
+    {"path": "../ui-kit"}
   ]
 }

packages/fract/package.json

@@ -25,9 +25,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/AliMD/fract",
-    "directory": "core/fract"
+    "directory": "packages/fract"
   },
-  "homepage": "https://github.com/AliMD/fract/tree/next/core/fract#readme",
+  "homepage": "https://github.com/AliMD/fract/tree/next/packages/fract#readme",
   "bugs": {
     "url": "https://github.com/AliMD/fract/issues"
   },

packages/fract/src/directives/observe.ts

@@ -2,7 +2,7 @@
 import {AlwatrDynamicDirective} from '../dynamic-directive.js';
 import {directive, noChange, type PartInfo} from '../lit-html.js';
 
-import type {AlwatrObservableInterface} from '@alwatr/signal2';
+import type {AlwatrObservableInterface} from '@alwatr/signal';
 
 class AlwatrObserveDirective<T extends AlwatrObservableInterface<unknown>> extends AlwatrDynamicDirective {
   protected _$observable?: T;

packages/fract/tsconfig.json

@@ -9,8 +9,5 @@
 
   "include": ["src/**/*.ts"],
   "exclude": [],
-  "references": [
-    {"path": "../logger"},
-    {"path": "../signal2"}
-  ]
+  "references": []
 }

packages/i18n/CHANGELOG.md

@@ -5,19 +5,19 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ## [1.0.1](https://github.com/AliMD/fract/compare/v1.0.0...v1.0.1) (2023-06-21)
 
-**Note:** Version bump only for package @alwatr/i18n2
+**Note:** Version bump only for package @alwatr/i18n
 
 # [1.0.0](https://github.com/AliMD/fract/compare/v0.32.0...v1.0.0) (2023-06-14)
 
 ### Bug Fixes
 
-- **i18n2:** return '' if key not exists ([2e68d1a](https://github.com/AliMD/fract/commit/2e68d1a082fb837b04fc8fe450626b507b0f2463))
-- **i18n2:** return loadingStr if resource not eixsts ([aff42e1](https://github.com/AliMD/fract/commit/aff42e18ddc61949f20cf13475520658ac1a5eb1))
-- **i18n2:** some issues & export an instacne ([b5874f3](https://github.com/AliMD/fract/commit/b5874f35051927815070a00e86c585f0e3dd291e))
+- **i18n:** return '' if key not exists ([2e68d1a](https://github.com/AliMD/fract/commit/2e68d1a082fb837b04fc8fe450626b507b0f2463))
+- **i18n:** return loadingStr if resource not eixsts ([aff42e1](https://github.com/AliMD/fract/commit/aff42e18ddc61949f20cf13475520658ac1a5eb1))
+- **i18n:** some issues & export an instacne ([b5874f3](https://github.com/AliMD/fract/commit/b5874f35051927815070a00e86c585f0e3dd291e))
 
 ### Features
 
-- **i18n2:** add `i18n2` class base ([4783d6b](https://github.com/AliMD/fract/commit/4783d6b7410e452a3458d72dc5ebaead62d08b2f))
+- **i18n:** add `i18n` class base ([4783d6b](https://github.com/AliMD/fract/commit/4783d6b7410e452a3458d72dc5ebaead62d08b2f))
 
 # [0.32.0](https://github.com/AliMD/fract/compare/v0.31.0...v0.32.0) (2023-05-27)
 

packages/i18n/README.md

@@ -1,3 +1,3 @@
-# Alwatr Internationalization - `@alwatr/i18n2`
+# Alwatr Internationalization - `@alwatr/i18n`
 
 Elegant powerful translation module (i18n/l10n) with dynamic json storage written in tiny TypeScript, ES module.

packages/i18n/package.json

@@ -25,9 +25,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/AliMD/fract",
-    "directory": "core/i18n"
+    "directory": "packages/i18n"
   },
-  "homepage": "https://github.com/AliMD/fract/tree/next/core/i18n#readme",
+  "homepage": "https://github.com/AliMD/fract/tree/next/packages/i18n#readme",
   "bugs": {
     "url": "https://github.com/AliMD/fract/issues"
   },

packages/i18n/src/l10n.ts

@@ -1,6 +1,6 @@
 import {globalAlwatr} from '@alwatr/logger';
 import {UnicodeDigits, UnicodeLangKeys} from '@alwatr/math';
-import {AlwatrObservable} from '@alwatr/signal2/observable.js';
+import {AlwatrObservable} from '@alwatr/signal/observable.js';
 
 import {localeList} from './locale-list.js';
 

packages/i18n/tsconfig.json

@@ -9,10 +9,5 @@
 
   "include": ["src/**/*.ts"],
   "exclude": [],
-  "references": [
-    {"path": "../type"},
-    {"path": "../logger"},
-    {"path": "../math"},
-    {"path": "../signal2"}
-  ]
+  "references": []
 }

packages/icon/src/preload.ts

@@ -1,10 +1,7 @@
 import {fetch} from '@alwatr/fetch';
-import {contextConsumer} from '@alwatr/signal';
-
-const urlPrefixContext = contextConsumer.bind<string>('icon-url-prefix');
 
 export async function preloadIcon(name: string): Promise<string> {
-  const urlPrefix = urlPrefixContext.getValue() ?? 'https://cdn.jsdelivr.net/npm/@alwatr/icon@0/svg/';
+  const urlPrefix = 'https://cdn.jsdelivr.net/npm/@alwatr/icon@1/svg/';
   const url = urlPrefix + name + '.svg';
 
   const response = await fetch({

packages/icon/tsconfig.json

@@ -15,9 +15,5 @@
 
   "include": ["src/**/*.ts"],
   "exclude": [],
-  "references": [
-    {"path": "../element"},
-    {"path": "../../core/fetch"},
-    {"path": "../../core/logger"}
-  ]
+  "references": []
 }

packages/playground/tailwind.config.js

@@ -4,6 +4,6 @@ export default {
   ...tailwindConfig,
   content: [
     '**/*.html',
-    // join(dirname(require.resolve('@alwatr/ui-kit2')), '**/*.ts'),
+    // join(dirname(require.resolve('@alwatr/ui-kit')), '**/*.ts'),
   ],
 };

packages/router/CHANGELOG.md

@@ -65,7 +65,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### Bug Fixes
 
-* **core/router:** preventDefault on svg link click ([e35e935](https://github.com/AliMD/fract/commit/e35e9351857d5bcb5128afbc87eb62dd11da865e))
+* **packages/router:** preventDefault on svg link click ([e35e935](https://github.com/AliMD/fract/commit/e35e9351857d5bcb5128afbc87eb62dd11da865e))
 
 # 0.26.0 (2022-12-22)
 
@@ -132,7 +132,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### Bug Fixes
 
-- **core/router:** preventDefault on svg link click ([e35e935](https://github.com/AliMD/fract/commit/e35e9351857d5bcb5128afbc87eb62dd11da865e))
+- **packages/router:** preventDefault on svg link click ([e35e935](https://github.com/AliMD/fract/commit/e35e9351857d5bcb5128afbc87eb62dd11da865e))
 
 # [0.26.0](https://github.com/AliMD/fract/compare/v0.25.0...v0.26.0) (2022-12-22)
 

packages/router/README.md

@@ -1,4 +1,4 @@
-# Alwatr Router2 - `@alwatr/router2`
+# Alwatr router - `@alwatr/router`
 
 Elegant powerful router (fundamental advance browser page routing) based on the simplicity of the signals written in tiny TypeScript module.
 

packages/router/package.json

@@ -24,9 +24,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/AliMD/fract",
-    "directory": "core/router2"
+    "directory": "packages/router"
   },
-  "homepage": "https://github.com/AliMD/fract/tree/next/core/router2#readme",
+  "homepage": "https://github.com/AliMD/fract/tree/next/packages/router#readme",
   "bugs": {
     "url": "https://github.com/AliMD/fract/issues"
   },

packages/router/src/index.ts

@@ -1,4 +1,4 @@
-import {AlwatrRouter} from './router2.js';
+import {AlwatrRouter} from './router.js';
 
 export type {RouteContext} from './type.js';
 

packages/router/src/router2.ts → packages/router/src/router.ts

@@ -1,18 +1,18 @@
 import {createLogger, globalAlwatr} from '@alwatr/logger';
-import {AlwatrObservable} from '@alwatr/signal2/observable.js';
+import {AlwatrObservable} from '@alwatr/signal/observable.js';
 
 import type {RouterConfig, PushState, RouteContext, RouteContextBase} from './type.js';
 import type {QueryParameters} from '@alwatr/type';
 
 globalAlwatr.registeredList.push({
-  name: '@alwatr/router2',
+  name: '@alwatr/router',
   version: _ALWATR_VERSION_,
 });
 
 const documentBaseUrl = document.querySelector('base')?.href || '/';
 
 export class AlwatrRouter extends AlwatrObservable<RouteContext> {
-  protected override _logger = createLogger('alwatr/router2');
+  protected override _logger = createLogger('alwatr/router');
 
   get route(): RouteContext {
     return this._$data ?? this._makeRouteContext();

packages/router/tsconfig.json

@@ -9,10 +9,5 @@
 
   "include": ["src/**/*.ts"],
   "exclude": [],
-  "references": [
-    {"path": "../logger"},
-    {"path": "../math"},
-    {"path": "../type"},
-    {"path": "../signal2"}
-  ]
+  "references": []
 }

packages/style/CHANGELOG.md

@@ -21,7 +21,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * **style:** add `stateLayerPlugin` ([db076dd](https://github.com/AliMD/fract/commit/db076dd5f3af851e5eac3e1c68d7b1e2cb7cbc0d))
 * **style:** add new color h260 ([c128609](https://github.com/AliMD/fract/commit/c128609963df0aba508f239799ef8c52ea066c40))
 * **style:** add our z-index ([af5c97f](https://github.com/AliMD/fract/commit/af5c97f6f9fb439ec414e903497f416ddd2a76de))
-* **style:** add ui-kit2 to tailwind content ([8aeb3c9](https://github.com/AliMD/fract/commit/8aeb3c90df1e87c1d7e128a0b50662727417e679))
+* **style:** add ui-kit to tailwind content ([8aeb3c9](https://github.com/AliMD/fract/commit/8aeb3c90df1e87c1d7e128a0b50662727417e679))
 * **style:** elevation util ([29412d6](https://github.com/AliMD/fract/commit/29412d6541ce63e2dbf4078a81b308c1b7a6020c))
 * **style:** enhance stateHover, stateActive ([0aa3ee1](https://github.com/AliMD/fract/commit/0aa3ee1ed13183921aed058502fd961f2902e676))
 * **style:** new package for alwatr 2 css system ([9b9c791](https://github.com/AliMD/fract/commit/9b9c791570f23ec14d724528b5173cfe93a5e46b))

packages/style/lib/tailwind.ts

@@ -13,7 +13,7 @@ export const tailwindConfig: Config = {
   content: [
     './res/*.html',
     './src/**/*.ts',
-    join(dirname(require.resolve('@alwatr/ui-kit2')), '**/*.ts'),
+    join(dirname(require.resolve('@alwatr/ui-kit')), '**/*.ts'),
   ],
   darkMode: 'media',
   theme: {

packages/style/tsconfig.json

@@ -9,7 +9,5 @@
 
   "include": ["**/*.ts"],
   "exclude": [],
-  "references": [
-    {"path": "../../core/logger"}
-  ]
+  "references": []
 }

packages/ui-kit/README.md

@@ -1,4 +1,4 @@
-# Alwatr UI-Kit 2 - `@alwatr/ui-kit2`
+# Alwatr UI-Kit - `@alwatr/ui-kit`
 
 Alwatr UI Elements Kit.
 

packages/ui-kit/navigation-bar/navigation-bar.ts

@@ -1,5 +1,5 @@
 import {AlwatrDirective, html, noChange, directive, mapObject, when, type PartInfo} from '@alwatr/fract';
-import {l10n} from '@alwatr/i18n2';
+import {l10n} from '@alwatr/i18n';
 
 import {icon, type IconContent} from '../icon/icon.js';
 

packages/ui-kit/navigation-drawer/navigation-drawer.ts

@@ -1,5 +1,5 @@
 import {AlwatrDirective, directive, html, mapObject, when, type PartInfo, classMap, noChange} from '@alwatr/fract';
-import {l10n} from '@alwatr/i18n2';
+import {l10n} from '@alwatr/i18n';
 
 import {icon, IconContent} from '../icon/icon.js';
 

packages/ui-kit/navigation-rail/navigation-rail.ts

@@ -1,5 +1,5 @@
 import {AlwatrDirective, classMap, directive, html, mapObject, noChange, when, type PartInfo} from '@alwatr/fract';
-import {l10n} from '@alwatr/i18n2';
+import {l10n} from '@alwatr/i18n';
 
 import {icon, type IconContent} from '../icon/icon.js';
 

packages/ui-kit/package.json

@@ -27,9 +27,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/AliMD/fract",
-    "directory": "packages/ui-kit2"
+    "directory": "packages/ui-kit"
   },
-  "homepage": "https://github.com/AliMD/fract/tree/next/packages/ui-kit2#readme",
+  "homepage": "https://github.com/AliMD/fract/tree/next/packages/ui-kit#readme",
   "bugs": {
     "url": "https://github.com/AliMD/fract/issues"
   },

packages/ui-kit/tsconfig.json

@@ -16,10 +16,6 @@
   "include": ["**/*.ts"],
   "exclude": [],
   "references": [
-    {"path": "../../core/fract"},
-    {"path": "../../core/type"},
-    {"path": "../../core/i18n2"},
-    {"path": "../../core/signal2"},
-    {"path": "../../core/util"},
+    {"path": "../fract"},
   ]
 }