Fixed some bugs

Author: mcjazzyfunky

ext/index.js

@@ -1,7 +1,7 @@
 'use strict'
 
 if (process.env.NODE_ENV === 'production') {
-  module.exports = require('../dist/js-elements.ext.cjs.production.js')
+  module.exports = require('../dist/js-elements-ext.cjs.production.js')
 } else {
-  module.exports = require('../dist/js-elements.ext.cjs.development.js')
+  module.exports = require('../dist/js-elements-ext.cjs.development.js')
 }

ext/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "js-elements-ext",
+  "version": "0.0.1",
+  "description": "",
+  "main": "index.js",
+  "module": "../dist/js-elements-ext.esm.producion.js",
+  "unpkg": "../dist/js-elements-ext.umd.production.js",
+  "jsdelivr": "../dist/js-elements-ext.umd.production.js",
+  "types": "../dist/types/js-elements-ext.d.ts"
+}

package.json

@@ -1,12 +1,12 @@
 {
   "name": "js-elements",
-  "version": "0.0.72",
+  "version": "0.0.76",
   "description": "",
   "main": "index.js",
   "module": "dist/js-elements.esm.producion.js",
   "unpkg": "dist/js-elements.umd.production.js",
   "jsdelivr": "dist/js-elements.umd.production.js",
-  "types": "dist/types/main/index.d.ts",
+  "types": "dist/types/js-elements.d.ts",
   "files": [
     "index.js",
     "dist",

rollup.config.js

@@ -33,7 +33,7 @@ function createConfig(pkg, moduleFormat, productive) {
       file:
         pkg === 'root'
           ? `dist/js-elements.${moduleFormat}.${env}.js`
-          : `dist/js-elements.${pkg}.${moduleFormat}.${env}.js`,
+          : `dist/js-elements-${pkg}.${moduleFormat}.${env}.js`,
 
       format: moduleFormat,
       sourcemap: false, // productive ? false : 'inline', // TODO

src/main/core/prop.ts

@@ -26,11 +26,11 @@ type TypeType<T extends Type | null> = T extends null
 
 type PropTypeBuilder<T> = {
   opt: {
-    (): PropType<T, false, false>
-    (defaultValue: T): PropType<T, true, false>
+    (): PropType<T, 'optional'>
+    (defaultValue: T): PropType<T, 'optional-with-default'>
   }
 
-  req: () => PropType<T, false, true>
+  req: () => PropType<T, 'required'>
 }
 
 type ExtPropTypeBuilder<T> = PropTypeBuilder<T> & {
@@ -52,7 +52,7 @@ type PropFunc = ExtPropTypeBuilder<any> & {
   nfunc: ExtPropTypeBuilder<((...args: any[]) => any) | null>
   narr: ExtPropTypeBuilder<any[] | null>
 
-  evt<T = any>(): PropType<(event: T) => void, false, false>
+  evt<T = any>(): PropType<(event: T) => void, 'optional'>
 
   <T extends Type>(t: T): ExtPropTypeBuilder<TypeType<T>>
 

src/main/core/types.ts

@@ -103,14 +103,13 @@ type Notifier = {
   notify(): void
 }
 
-declare const kind: unique symbol
+declare const tag: unique symbol
 
 type PropType<
   Type,
-  HasDefaultValue extends Boolean,
-  Required extends boolean
+  Kind extends 'optional' | 'optional-with-default' | 'required'
 > = {
-  readonly [kind]: 'PropType'
+  readonly [tag]: 'PropType'
 }
 
 type ComponentOptions = {
@@ -147,14 +146,14 @@ type PropConfig =
     }
 
 type PropsConfig = {
-  [key: string]: PropType<any, any, any>
+  [key: string]: PropType<any, any>
 }
 
 type ExternalPropsOf<PC extends PropsConfig> = Partial<
   OmitNevers<
     {
-      [K in keyof PC]: PC[K] extends PropType<infer T, infer D, infer R>
-        ? R extends true
+      [K in keyof PC]: PC[K] extends PropType<infer T, infer K>
+        ? K extends 'required'
           ? never
           : T
         : never
@@ -163,8 +162,8 @@ type ExternalPropsOf<PC extends PropsConfig> = Partial<
 > &
   OmitNevers<
     {
-      [K in keyof PC]: PC[K] extends PropType<infer T, infer D, infer R>
-        ? R extends true
+      [K in keyof PC]: PC[K] extends PropType<infer T, infer K>
+        ? K extends 'required'
           ? T
           : never
         : never
@@ -174,10 +173,10 @@ type ExternalPropsOf<PC extends PropsConfig> = Partial<
 type InternalPropsOf<PC extends PropsConfig> = Partial<
   OmitNevers<
     {
-      [K in keyof PC]: PC[K] extends PropType<infer T, infer D, infer R>
-        ? R extends true
+      [K in keyof PC]: PC[K] extends PropType<infer T, infer K>
+        ? K extends 'required'
           ? never
-          : D extends true
+          : K extends 'optional-with-default'
           ? never
           : T
         : never
@@ -186,10 +185,10 @@ type InternalPropsOf<PC extends PropsConfig> = Partial<
 > &
   OmitNevers<
     {
-      [K in keyof PC]: PC[K] extends PropType<infer T, infer D, infer R>
-        ? R extends true
+      [K in keyof PC]: PC[K] extends PropType<infer T, infer K>
+        ? K extends 'required'
           ? T
-          : D extends true
+          : K extends 'optional-with-default'
           ? T
           : never
         : never

src/main/js-elements.ts

@@ -318,15 +318,15 @@ const renderer = (content: VElement, target: Element) => {
 // === render ========================================================
 
 function render(content: VElement, container: Element | string) {
-  if (content !== null && (!content || content.kind !== 'virtual-element')) {
-    //throw new TypeError()
-    //      'First argument "content" of function "render" must be a virtual element or null'
+  if (content !== null && (!content || content.isVElement !== true)) {
+    throw new TypeError()
+    'First argument "content" of function "render" must be a virtual element or null'
   }
 
   if (!container || (typeof container !== 'string' && !container.tagName)) {
-    //throw new TypeError(
-    //  'Second argument "container" of funtion "render" must either be a DOM element or selector string for the DOM element'
-    // )
+    throw new TypeError(
+      'Second argument "container" of function "render" must either be a DOM element or selector string for the DOM element'
+    )
   }
 
   const target =
@@ -341,7 +341,7 @@ function render(content: VElement, container: Element | string) {
   target.innerHTML = ''
 
   if (content !== null) {
-    patch(content, target)
+    renderer(content, target)
   }
 }