Merge pull request #195 from what1s1ove/task/wd-159-js-packages

wd-159: use js packages folder approach

source/scripts/form.js

@@ -1,5 +1,5 @@
-import { Form } from '~/components/form/form.js'
-import { timelineApi } from '~/services/services.js'
+import { timelineApi } from '~/packages/timeline/timeline.js'
+import { Form } from '~/pages/form/form.js'
 
 let form = new Form({
   timelineApi,

source/scripts/globals.d.ts

@@ -1,4 +1,4 @@
-import { WhatisloveMath } from '~/services/whatislove-math/whatislove-math.service.js'
+import { WhatisloveMath } from '~/libs/packages/whatislove-math/whatislove-math.js'
 
 declare global {
   var WhatisloveMath: WhatisloveMath

source/scripts/index.js

@@ -1,5 +1,7 @@
-import { Home } from '~/components/home/home.js'
-import { storage, timelineApi, WhatisloveMath } from '~/services/services.js'
+import { storage } from '~/libs/packages/storage/storage.js'
+import { WhatisloveMath } from '~/libs/packages/whatislove-math/whatislove-math.package.js'
+import { timelineApi } from '~/packages/timeline/timeline.js'
+import { Home } from '~/pages/home/home.js'
 
 let home = new Home({
   storage,

source/scripts/components/common/loader/helpers/get-loader-element/get-loader-element.helper.js → source/scripts/libs/components/loader/libs/helpers/get-loader-element/get-loader-element.helper.js

@@ -1,4 +1,4 @@
-import { createElement } from '~/helpers/helpers.js'
+import { createElement } from '~/libs/helpers/helpers.js'
 
 /** @returns {HTMLElement} */
 let getLoaderElement = () => {

source/scripts/components/common/loader/loader.js → source/scripts/libs/components/loader/loader.js

@@ -1,4 +1,4 @@
-import { getLoaderElement } from './helpers/helpers.js'
+import { getLoaderElement } from './libs/helpers/helpers.js'
 
 class Loader {
   /**

source/scripts/components/common/toast/toast.js → source/scripts/libs/components/toast/toast.js

@@ -1,12 +1,12 @@
-import { setAsyncTimeout } from '~/helpers/helpers.js'
+import { setAsyncTimeout } from '~/libs/helpers/helpers.js'
 
 import {
   CLEAN_MESSAGE_DELAY,
   TOAST_DEFAULT_DURATION,
   TOAST_SHOW_CLASS_NAME,
-} from './common/constants.js'
+} from './libs/constants/constants.js'
 
-/** @typedef {import('~/common/types/toast/toast').ToastMessagePayload} ToastMessagePayload */
+/** @typedef {import('~/libs/types/types').ToastMessagePayload} ToastMessagePayload */
 
 class Toast {
   constructor() {

source/scripts/libs/enums/enums.js

@@ -0,0 +1,7 @@
+export { ApiPath } from './api-path.enum.js'
+export { AppConfig } from './app-config.enum.js'
+export { ContentType } from './content-type.enum.js'
+export { CustomExceptionName } from './custom-exception-name.enum.js'
+export { ErrorMessage } from './error-message.enum.js'
+export { KeyboardKey } from './keyboard-key.enum.js'
+export { NotificationMessage } from './notification-message.enum.js'

source/scripts/libs/enums/error-message.enum.js

@@ -0,0 +1,5 @@
+let ErrorMessage = /** @type {const} */ ({
+  NETWORK_ERROR: `Network Error`,
+})
+
+export { ErrorMessage }

source/scripts/helpers/form/fill-select-options/fill-select-options.helper.js → source/scripts/libs/helpers/fill-select-options/fill-select-options.helper.js

@@ -1,5 +1,5 @@
-import { addSelectOptions } from '~/helpers/form/add-select-options/add-select-options.helper.js'
-import { createSelectOptions } from '~/helpers/form/create-select-options/create-select-options.helper.js'
+import { addSelectOptions } from '../add-select-options/add-select-options.helper.js'
+import { createSelectOptions } from '../create-select-options/create-select-options.helper.js'
 
 /**
  * @param {HTMLSelectElement} selectNode

source/scripts/libs/helpers/helpers.js

@@ -0,0 +1,15 @@
+export { addSelectOptions } from './add-select-options/add-select-options.helper.js'
+export { checkIsBeforeElement } from './check-is-before-element/check-is-before-element.helper.js'
+export { checkIsOneOf } from './check-is-one-of/check-is-one-of.helper.js'
+export { createElement } from './create-element/create-element.helper.js'
+export { createSelectOptions } from './create-select-options/create-select-options.helper.js'
+export { fillSelectOptions } from './fill-select-options/fill-select-options.helper.js'
+export { getCustomAttributeName } from './get-custom-attribute-name/get-custom-attribute-name.helper.js'
+export { getFormattedDate } from './get-formatted-date/get-formatted-date.helper.js'
+export { getRandomNumber } from './get-random-number/get-random-number.helper.js'
+export { getServerApiUrl } from './get-server-api-url/get-server-api-url.helper.js'
+export { getStringWitCheck } from './get-string-with-check/get-string-with-check.helper.js'
+export { initDebounce } from './init-debounce/init-debounce.helper.js'
+export { setAsyncTimeout } from './set-async-timeout/set-async-timeout.helper.js'
+export { subscribeFocusTrap } from './subscribe-focus-trap/subscribe-focus-trap.helper.js'
+export { getFormValues } from 'form-payload'

source/scripts/helpers/timeout/debounce/debounce.helper.js → source/scripts/libs/helpers/init-debounce/init-debounce.helper.js

@@ -3,7 +3,7 @@
  * @param {number} delay
  * @returns {(...args: unknown[]) => unknown}
  */
-let debounce = (callback, delay) => {
+let initDebounce = (callback, delay) => {
   let /** @type {undefined | number} */ timeout
 
   return (...arguments_) => {
@@ -13,4 +13,4 @@ let debounce = (callback, delay) => {
   }
 }
 
-export { debounce }
+export { initDebounce }

source/scripts/helpers/dom/subscribe-focus-trap/subscribe-focus-trap.helper.js → source/scripts/libs/helpers/subscribe-focus-trap/subscribe-focus-trap.helper.js

@@ -1,4 +1,4 @@
-import { KeyboardKey } from '~/common/enums/enums.js'
+import { KeyboardKey } from '~/libs/enums/enums.js'
 
 /**
  * @param {HTMLElement[]} elements

source/scripts/libs/packages/http/http.js

@@ -0,0 +1,7 @@
+import { Http } from './http.package.js'
+
+let http = new Http()
+
+export { http }
+export { Http } from './http.package.js'
+export { HttpMethod } from './libs/enums/enums.js'

source/scripts/services/http/http.service.js → source/scripts/libs/packages/http/http.package.js

@@ -1,11 +1,8 @@
-import {
-  ApiErrorMessage,
-  ContentType,
-  HttpHeader,
-  HttpMethod,
-} from '~/common/enums/enums.js'
-import { HttpError } from '~/exceptions/exceptions.js'
-import { checkIsOneOf } from '~/helpers/helpers.js'
+import { ContentType, ErrorMessage } from '~/libs/enums/enums.js'
+import { checkIsOneOf } from '~/libs/helpers/helpers.js'
+
+import { HttpHeader, HttpMethod } from './libs/enums/enums.js'
+import { HttpError } from './libs/exceptions/exceptions.js'
 
 class Http {
   /**
@@ -17,8 +14,8 @@ class Http {
     if (!response.ok) {
       throw new HttpError({
         message:
-          /** @type {(typeof ApiErrorMessage)[keyof typeof ApiErrorMessage]} */ (
-            response.statusText ?? ApiErrorMessage.NETWORK_ERROR
+          /** @type {(typeof ErrorMessage)[keyof typeof ErrorMessage]} */ (
+            response.statusText ?? ErrorMessage.NETWORK_ERROR
           ),
       })
     }

source/scripts/exceptions/http-error/http-error.exception.js → source/scripts/libs/packages/http/libs/exceptions/http-error/http-error.exception.js

@@ -1,18 +1,16 @@
-import {
-  ApiErrorMessage,
-  CustomExceptionName,
-  HttpCode,
-} from '~/common/enums/enums.js'
+import { CustomExceptionName, ErrorMessage } from '~/libs/enums/enums.js'
+
+import { HttpCode } from '../../enums/enums.js'
 
 class HttpError extends Error {
   /**
    * @param {{
-   *   message?: (typeof ApiErrorMessage)[keyof typeof ApiErrorMessage]
+   *   message?: (typeof ErrorMessage)[keyof typeof ErrorMessage]
    *   status?: (typeof HttpCode)[keyof typeof HttpCode]
    * }} [properties]
    */
   constructor({
-    message = ApiErrorMessage.NETWORK_ERROR,
+    message = ErrorMessage.NETWORK_ERROR,
     status = HttpCode.INTERNAL_SERVER_ERROR,
   } = {}) {
     super(message)

source/scripts/libs/packages/storage/storage.js

@@ -0,0 +1,8 @@
+import { Storage } from './storage.package.js'
+
+let storage = new Storage({
+  storage: localStorage,
+})
+
+export { storage }
+export { Storage } from './storage.package.js'

source/scripts/libs/packages/whatislove-math/whatislove-math.js

@@ -0,0 +1 @@
+export { WhatisloveMath } from './whatislove-math.package.js'

source/scripts/packages/timeline/libs/enums/enums.js

@@ -0,0 +1,3 @@
+export { TimelineApiPath } from './timeline-api-path.enum.js'
+export { TimelineSkillType } from './timeline-skill-type.enum.js'
+export { TimelineType } from './timeline-type.enum.js'

source/scripts/packages/timeline/libs/enums/timeline-skill-type.enum.js

@@ -0,0 +1,6 @@
+let TimelineSkillType = /** @type {const} */ ({
+  HARD_SKILL: `hardSkill`,
+  SOFT_SKILL: `softSkill`,
+})
+
+export { TimelineSkillType }

source/scripts/common/types/timeline/timeline-create-payload.type.d.ts → source/scripts/packages/timeline/libs/types/timeline-create-payload.type.d.ts

@@ -1,4 +1,4 @@
-import { type TimelineType, type SkillType } from '~/common/enums/enums.js'
+import { type TimelineType, type TimelineSkillType } from '../enums/enums.js'
 
 type TimelineCreatePayload = {
   date: string
@@ -9,7 +9,7 @@ type TimelineCreatePayload = {
   origin: string
   originDesc: string
   title: string
-  skillType: (typeof SkillType)[keyof typeof SkillType]
+  skillType: (typeof TimelineSkillType)[keyof typeof TimelineSkillType]
   type: (typeof TimelineType)[keyof typeof TimelineType]
 }
 

source/scripts/packages/timeline/libs/types/timeline-filter.d.type.d.ts

@@ -0,0 +1,11 @@
+import { type TimelineType, type TimelineSkillType } from '../enums/enums.js'
+
+type TimelineFilter = {
+  skillTypes: Record<
+    (typeof TimelineSkillType)[keyof typeof TimelineSkillType],
+    boolean
+  >
+  types: Record<(typeof TimelineType)[keyof typeof TimelineType], boolean>
+}
+
+export { type TimelineFilter }

source/scripts/common/types/timeline/timeline.type.d.ts → source/scripts/packages/timeline/libs/types/timeline.type.d.ts

@@ -1,4 +1,4 @@
-import { type TimelineType, type SkillType } from '~/common/enums/enums.js'
+import { type TimelineType, type TimelineSkillType } from '../enums/enums.js'
 
 type Timeline = {
   id: string
@@ -10,7 +10,7 @@ type Timeline = {
   origin: string
   originDesc: string
   title: string
-  skillType: (typeof SkillType)[keyof typeof SkillType]
+  skillType: (typeof TimelineSkillType)[keyof typeof TimelineSkillType]
   type: (typeof TimelineType)[keyof typeof TimelineType]
 }
 

source/scripts/services/timeline-api/timeline-api.service.js → source/scripts/packages/timeline/timeline-api.js

@@ -1,13 +1,11 @@
-import {
-  ApiPath,
-  ContentType,
-  HttpMethod,
-  TimelineApiPath,
-} from '~/common/enums/enums.js'
-
-/** @typedef {import('~/common/types/timeline/timeline').Timeline} Timeline */
-/** @typedef {import('~/services/http/http.service').Http} Http */
-/** @typedef {import('~/common/types/timeline/timeline')} TimelineCreatePayload */
+import { ApiPath, ContentType } from '~/libs/enums/enums.js'
+import { HttpMethod } from '~/libs/packages/http/http.js'
+
+import { TimelineApiPath } from './libs/enums/enums.js'
+
+/** @typedef {import('~/libs/packages/http/http').Http} Http */
+/** @typedef {import('./libs/types/types').Timeline} Timeline */
+/** @typedef {import('./libs/types/types')} TimelineCreatePayload */
 
 class TimelineApi {
   /**

source/scripts/packages/timeline/timeline.js

@@ -0,0 +1,22 @@
+import { AppConfig } from '~/libs/enums/enums.js'
+import { getServerApiUrl } from '~/libs/helpers/helpers.js'
+import { http } from '~/libs/packages/http/http.js'
+
+import { TimelineApi } from './timeline-api.js'
+
+/** @typedef {import('./libs/types/types').Timeline} Timeline */
+/** @typedef {import('./libs/types/types').TimelineCreatePayload} TimelineCreatePayload */
+/** @typedef {import('./libs/types/types').TimelineFilter} TimelineFilter */
+
+let timelineApi = new TimelineApi({
+  baseUrl: getServerApiUrl({
+    host: AppConfig.SERVER_HOST,
+    port: AppConfig.SERVER_PORT,
+  }),
+  filesApiPath: AppConfig.FILES_API_PATH,
+  http,
+})
+
+export { timelineApi }
+export { TimelineSkillType, TimelineType } from './libs/enums/enums.js'
+export { TimelineApi } from './timeline-api.js'