@htmlplus/element 2.13.0 → 2.13.2

package/bundlers.d.ts

@@ -13,7 +13,6 @@ declare const vite: (...plugins: Array<TransformerPlugin>) => {
     name: string;
     buildStart(): Promise<void>;
     load(id: any): Promise<string | undefined>;
-    buildEnd(): Promise<void>;
     writeBundle(options: any, bundles: any): Promise<void>;
 };
 

package/bundlers.js

@@ -1,3 +1,4 @@
+import { KEY } from './constants.js';
 import { transformer } from './transformer.js';
 import 'fs-extra';
 import '@babel/template';
@@ -9,12 +10,11 @@ import 'glob';
 import '@babel/generator';
 import path from 'node:path';
 import 'ora';
-import './constants.js';
 
 const rollup = (...plugins) => {
     const { start, run, finish } = transformer(...plugins);
     return {
-        name: 'htmlplus',
+        name: KEY,
         async buildStart() {
             await start();
         },
@@ -35,52 +35,39 @@ const rollup = (...plugins) => {
 };
 
 const vite = (...plugins) => {
-    const { global, start, run, finish, write } = transformer(...plugins);
+    const { global, start, run, finish } = transformer(...plugins);
     return {
-        name: 'htmlplus',
+        name: KEY,
         async buildStart() {
             await start();
         },
         async load(id) {
             if (!id.endsWith('.tsx'))
                 return;
-            let { script, skipped, stylePath } = await run(id);
-            if (skipped)
+            const context = await run(id);
+            if (context.skipped)
                 return;
-            if (script && stylePath) {
-                script = script.replace(path.basename(stylePath), `${path.basename(stylePath)}?inline`);
+            if (context.script && context.stylePath) {
+                context.script = context.script.replace(path.basename(context.stylePath), `$&?inline`);
             }
-            return script;
-        },
-        async buildEnd() {
-            await finish();
+            return context.script;
         },
         async writeBundle(options, bundles) {
             // TODO
-            try {
-                for (const context of global.contexts) {
-                    for (const key in bundles) {
-                        if (!Object.hasOwnProperty.call(bundles, key))
-                            continue;
-                        const bundle = bundles[key];
-                        if (!bundle.facadeModuleId.startsWith(context.filePath))
-                            continue;
-                        const modules = bundle['modules'];
-                        for (const key in modules) {
-                            if (!Object.hasOwnProperty.call(modules, key))
-                                continue;
-                            const module = modules[key];
-                            if (!key.startsWith(context.stylePath || ''))
-                                continue;
-                            context.styleContentTransformed = module.code;
-                            break;
-                        }
-                        break;
-                    }
-                }
-            }
-            catch { }
-            await write();
+            global.contexts.forEach((context) => {
+                Object.keys(bundles).forEach((key) => {
+                    const { facadeModuleId, modules } = bundles[key];
+                    if (!facadeModuleId?.startsWith(context.filePath))
+                        return;
+                    const id = Object.keys(modules).find((key) => {
+                        return key.startsWith(context.stylePath || '');
+                    });
+                    if (!id)
+                        return;
+                    context.styleContentTransformed = modules[id].code;
+                });
+            });
+            await finish();
         }
     };
 };

package/{client-Dse96R-O.js → client-B7RqkVf0.js}

@@ -1,5 +1,5 @@
 import { kebabCase, camelCase, pascalCase } from 'change-case';
-import { API_HOST, STATIC_STYLE, STATIC_TAG, API_STACKS, API_REQUEST, API_CONNECTED, LIFECYCLE_UPDATE, API_STYLE, LIFECYCLE_UPDATED, API_RENDER_COMPLETED, METHOD_RENDER, TYPE_BOOLEAN, TYPE_NUMBER, TYPE_NULL, TYPE_DATE, TYPE_ARRAY, TYPE_OBJECT, TYPE_UNDEFINED, LIFECYCLE_CONNECTED, LIFECYCLE_DISCONNECTED, API_INSTANCE, MAPPER, LIFECYCLE_CONSTRUCTED, LIFECYCLE_ADOPTED, LIFECYCLE_LOADED } from './constants.js';
+import { API_HOST, STATIC_TAG, API_STACKS, API_REQUEST, API_CONNECTED, LIFECYCLE_UPDATE, STATIC_STYLE, API_STYLE, LIFECYCLE_UPDATED, API_RENDER_COMPLETED, METHOD_RENDER, TYPE_BOOLEAN, TYPE_NUMBER, TYPE_NULL, TYPE_DATE, TYPE_ARRAY, TYPE_OBJECT, TYPE_UNDEFINED, LIFECYCLE_CONNECTED, LIFECYCLE_DISCONNECTED, KEY, API_INSTANCE, MAPPER, LIFECYCLE_CONSTRUCTED, LIFECYCLE_ADOPTED, LIFECYCLE_LOADED } from './constants.js';
 
 const appendToMethod = (target, key, handler) => {
     // Gets the previous function
@@ -264,10 +264,6 @@ const getFramework = (target) => {
         return 'angular';
 };
 
-const getStyles = (target) => {
-    return target.constructor[STATIC_STYLE] ?? target[STATIC_STYLE];
-};
-
 const getTag = (target) => {
     return target.constructor[STATIC_TAG] ?? target[STATIC_TAG];
 };
@@ -1125,12 +1121,13 @@ const request = (target, name, previous, callback) => {
         });
         // TODO
         (() => {
-            const raw = getStyles(target);
+            const raw = target.constructor[STATIC_STYLE];
             if (!raw)
                 return;
             const regex1 = /this-([\w-]+)(?:-([\w-]+))?/g;
             const regex2 = /(\s*\w+\s*:\s*(undefined|null)\s*;?)/g;
-            const hasGlobal = raw.includes(':global');
+            const regex3 = /global\s+[^{]+\{[^{}]*\{[^{}]*\}[^{}]*\}|global\s+[^{]+\{[^{}]*\}/g;
+            const hasGlobal = raw.includes('global');
             const hasVariable = raw.includes('this-');
             let localSheet = target[API_STYLE];
             let globalSheet = target.constructor[API_STYLE];
@@ -1150,8 +1147,8 @@ const request = (target, name, previous, callback) => {
                 target[API_STYLE] = localSheet;
                 shadowRoot(target).adoptedStyleSheets.push(localSheet);
             }
-            const localStyle = parsed;
-            localSheet.replace(localStyle);
+            const localStyle = parsed.replace(regex3, '');
+            localSheet.replaceSync(localStyle);
             if (!hasGlobal || globalSheet)
                 return;
             if (!globalSheet) {
@@ -1160,21 +1157,11 @@ const request = (target, name, previous, callback) => {
                 document.adoptedStyleSheets.push(globalSheet);
             }
             const globalStyle = parsed
-                .split('}')
-                .map((rule) => {
-                let [selectors, properties] = rule.split('{');
-                selectors = selectors
-                    .split(',')
-                    .map((selector) => selector.trim())
-                    .filter((selector) => selector.startsWith(':global'))
-                    .map((selector) => selector.replace(':global', ''))
-                    .map((selector) => selector.trim())
-                    .join(',');
-                return selectors ? `${selectors}{${properties}}` : '';
-            })
-                .filter((selector) => !!selector)
-                .join('');
-            globalSheet.replace(globalStyle);
+                ?.match(regex3)
+                ?.join('')
+                ?.replaceAll('global', '')
+                ?.replaceAll(':host', getTag(target));
+            globalSheet.replaceSync(globalStyle);
         })();
         // Calls the lifecycle's callback after the rendering phase.
         call(target, LIFECYCLE_UPDATED, states);
@@ -1317,7 +1304,7 @@ function Provider(namespace) {
     return function (target, key, descriptor) {
         const symbol = Symbol();
         const [MAIN, SUB] = namespace.split('.');
-        const prefix = `htmlplus:${MAIN}`;
+        const prefix = `${KEY}:${MAIN}`;
         const cleanups = (instance) => {
             return (instance[symbol] ||= new Map());
         };
@@ -1369,7 +1356,7 @@ function Consumer(namespace) {
     return function (target, key) {
         const symbol = Symbol();
         const [MAIN, SUB] = namespace.split('.');
-        const prefix = `htmlplus:${MAIN}`;
+        const prefix = `${KEY}:${MAIN}`;
         const cleanups = (instance) => {
             return (instance[symbol] ||= new Map());
         };

package/client.js

@@ -1,3 +1,3 @@
-export { B as Bind, C as Consumer, D as Direction, E as Element, k as Event, H as Host, I as IsRTL, L as Listen, M as Method, l as Property, P as Provider, Q as Query, m as QueryAll, S as Slots, n as State, W as Watch, c as classes, d as direction, a as dispatch, g as getConfig, h as host, i as isCSSColor, b as isRTL, f as off, o as on, q as query, e as queryAll, j as setConfig, s as slots, t as toUnit } from './client-Dse96R-O.js';
+export { B as Bind, C as Consumer, D as Direction, E as Element, k as Event, H as Host, I as IsRTL, L as Listen, M as Method, l as Property, P as Provider, Q as Query, m as QueryAll, S as Slots, n as State, W as Watch, c as classes, d as direction, a as dispatch, g as getConfig, h as host, i as isCSSColor, b as isRTL, f as off, o as on, q as query, e as queryAll, j as setConfig, s as slots, t as toUnit } from './client-B7RqkVf0.js';
 import 'change-case';
 import './constants.js';

package/constants.d.ts

@@ -1,3 +1,4 @@
+declare const KEY = "htmlplus";
 declare const PACKAGE_NAME = "@htmlplus/element";
 declare const MAPPER: unique symbol;
 declare const API_CONNECTED: unique symbol;
@@ -28,6 +29,7 @@ declare const STATIC_STYLE = "style";
 declare const STATIC_TAG = "tag";
 declare const STYLE_IMPORTED = "STYLE_IMPORTED";
 declare const TYPE_ARRAY: number;
+declare const TYPE_BIGINT: number;
 declare const TYPE_BOOLEAN: number;
 declare const TYPE_DATE: number;
 declare const TYPE_ENUM: number;
@@ -45,4 +47,4 @@ declare const UTILS_STYLES_IMPORTED = "styles";
 declare const UTILS_STYLES_LOCAL = "UTILS_STYLES";
 declare const UTILS_PATH = "@htmlplus/element/internal.js";
 
-export { API_CONNECTED, API_HOST, API_INSTANCE, API_RENDER_COMPLETED, API_REQUEST, API_STACKS, API_STYLE, COMMENT_AUTO_ADDED, DECORATOR_CSS_VARIABLE, DECORATOR_ELEMENT, DECORATOR_EVENT, DECORATOR_METHOD, DECORATOR_PROPERTY, DECORATOR_PROPERTY_TYPE, DECORATOR_STATE, ELEMENT_HOST_NAME, LIFECYCLE_ADOPTED, LIFECYCLE_CONNECTED, LIFECYCLE_CONSTRUCTED, LIFECYCLE_DISCONNECTED, LIFECYCLE_LOADED, LIFECYCLE_UPDATE, LIFECYCLE_UPDATED, MAPPER, METHOD_RENDER, PACKAGE_NAME, STATIC_STYLE, STATIC_TAG, STYLE_IMPORTED, TYPE_ARRAY, TYPE_BOOLEAN, TYPE_DATE, TYPE_ENUM, TYPE_FUNCTION, TYPE_NULL, TYPE_NUMBER, TYPE_OBJECT, TYPE_STRING, TYPE_UNDEFINED, UTILS_ATTRIBUTES_IMPORTED, UTILS_ATTRIBUTES_LOCAL, UTILS_HTML_IMPORTED, UTILS_HTML_LOCAL, UTILS_PATH, UTILS_STYLES_IMPORTED, UTILS_STYLES_LOCAL };
+export { API_CONNECTED, API_HOST, API_INSTANCE, API_RENDER_COMPLETED, API_REQUEST, API_STACKS, API_STYLE, COMMENT_AUTO_ADDED, DECORATOR_CSS_VARIABLE, DECORATOR_ELEMENT, DECORATOR_EVENT, DECORATOR_METHOD, DECORATOR_PROPERTY, DECORATOR_PROPERTY_TYPE, DECORATOR_STATE, ELEMENT_HOST_NAME, KEY, LIFECYCLE_ADOPTED, LIFECYCLE_CONNECTED, LIFECYCLE_CONSTRUCTED, LIFECYCLE_DISCONNECTED, LIFECYCLE_LOADED, LIFECYCLE_UPDATE, LIFECYCLE_UPDATED, MAPPER, METHOD_RENDER, PACKAGE_NAME, STATIC_STYLE, STATIC_TAG, STYLE_IMPORTED, TYPE_ARRAY, TYPE_BIGINT, TYPE_BOOLEAN, TYPE_DATE, TYPE_ENUM, TYPE_FUNCTION, TYPE_NULL, TYPE_NUMBER, TYPE_OBJECT, TYPE_STRING, TYPE_UNDEFINED, UTILS_ATTRIBUTES_IMPORTED, UTILS_ATTRIBUTES_LOCAL, UTILS_HTML_IMPORTED, UTILS_HTML_LOCAL, UTILS_PATH, UTILS_STYLES_IMPORTED, UTILS_STYLES_LOCAL };

package/constants.js

@@ -1,3 +1,4 @@
+const KEY = 'htmlplus';
 const PACKAGE_NAME = '@htmlplus/element';
 // TODO
 const MAPPER = Symbol();
@@ -39,15 +40,16 @@ const STATIC_TAG = 'tag';
 const STYLE_IMPORTED = 'STYLE_IMPORTED';
 // types
 const TYPE_ARRAY = 2 ** 0;
-const TYPE_BOOLEAN = 2 ** 1;
-const TYPE_DATE = 2 ** 2;
-const TYPE_ENUM = 2 ** 3;
-const TYPE_FUNCTION = 2 ** 4;
-const TYPE_NULL = 2 ** 5;
-const TYPE_NUMBER = 2 ** 6;
-const TYPE_OBJECT = 2 ** 7;
-const TYPE_STRING = 2 ** 8;
-const TYPE_UNDEFINED = 2 ** 9;
+const TYPE_BIGINT = 2 ** 1;
+const TYPE_BOOLEAN = 2 ** 2;
+const TYPE_DATE = 2 ** 3;
+const TYPE_ENUM = 2 ** 4;
+const TYPE_FUNCTION = 2 ** 5;
+const TYPE_NULL = 2 ** 6;
+const TYPE_NUMBER = 2 ** 7;
+const TYPE_OBJECT = 2 ** 8;
+const TYPE_STRING = 2 ** 9;
+const TYPE_UNDEFINED = 2 ** 10;
 // utils
 const UTILS_ATTRIBUTES_IMPORTED = 'attributes';
 const UTILS_ATTRIBUTES_LOCAL = 'UTILS_ATTRIBUTES';
@@ -57,4 +59,4 @@ const UTILS_STYLES_IMPORTED = 'styles';
 const UTILS_STYLES_LOCAL = 'UTILS_STYLES';
 const UTILS_PATH = '@htmlplus/element/internal.js';
 
-export { API_CONNECTED, API_HOST, API_INSTANCE, API_RENDER_COMPLETED, API_REQUEST, API_STACKS, API_STYLE, COMMENT_AUTO_ADDED, DECORATOR_CSS_VARIABLE, DECORATOR_ELEMENT, DECORATOR_EVENT, DECORATOR_METHOD, DECORATOR_PROPERTY, DECORATOR_PROPERTY_TYPE, DECORATOR_STATE, ELEMENT_HOST_NAME, LIFECYCLE_ADOPTED, LIFECYCLE_CONNECTED, LIFECYCLE_CONSTRUCTED, LIFECYCLE_DISCONNECTED, LIFECYCLE_LOADED, LIFECYCLE_UPDATE, LIFECYCLE_UPDATED, MAPPER, METHOD_RENDER, PACKAGE_NAME, STATIC_STYLE, STATIC_TAG, STYLE_IMPORTED, TYPE_ARRAY, TYPE_BOOLEAN, TYPE_DATE, TYPE_ENUM, TYPE_FUNCTION, TYPE_NULL, TYPE_NUMBER, TYPE_OBJECT, TYPE_STRING, TYPE_UNDEFINED, UTILS_ATTRIBUTES_IMPORTED, UTILS_ATTRIBUTES_LOCAL, UTILS_HTML_IMPORTED, UTILS_HTML_LOCAL, UTILS_PATH, UTILS_STYLES_IMPORTED, UTILS_STYLES_LOCAL };
+export { API_CONNECTED, API_HOST, API_INSTANCE, API_RENDER_COMPLETED, API_REQUEST, API_STACKS, API_STYLE, COMMENT_AUTO_ADDED, DECORATOR_CSS_VARIABLE, DECORATOR_ELEMENT, DECORATOR_EVENT, DECORATOR_METHOD, DECORATOR_PROPERTY, DECORATOR_PROPERTY_TYPE, DECORATOR_STATE, ELEMENT_HOST_NAME, KEY, LIFECYCLE_ADOPTED, LIFECYCLE_CONNECTED, LIFECYCLE_CONSTRUCTED, LIFECYCLE_DISCONNECTED, LIFECYCLE_LOADED, LIFECYCLE_UPDATE, LIFECYCLE_UPDATED, MAPPER, METHOD_RENDER, PACKAGE_NAME, STATIC_STYLE, STATIC_TAG, STYLE_IMPORTED, TYPE_ARRAY, TYPE_BIGINT, TYPE_BOOLEAN, TYPE_DATE, TYPE_ENUM, TYPE_FUNCTION, TYPE_NULL, TYPE_NUMBER, TYPE_OBJECT, TYPE_STRING, TYPE_UNDEFINED, UTILS_ATTRIBUTES_IMPORTED, UTILS_ATTRIBUTES_LOCAL, UTILS_HTML_IMPORTED, UTILS_HTML_LOCAL, UTILS_PATH, UTILS_STYLES_IMPORTED, UTILS_STYLES_LOCAL };

package/internal.js

@@ -1,3 +1,3 @@
-export { p as attributes, r as html, u as styles } from './client-Dse96R-O.js';
+export { p as attributes, r as html, u as styles } from './client-B7RqkVf0.js';
 import 'change-case';
 import './constants.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@htmlplus/element",
-  "version": "2.13.0",
+  "version": "2.13.2",
   "license": "MIT",
   "sideEffects": false,
   "author": "Masood Abdolian <m.abdolian@gmail.com>",
@@ -58,6 +58,7 @@
     "prettier": "^3.3.3",
     "rimraf": "^6.0.1",
     "rollup": "^4.20.0",
+    "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-dts": "^6.1.1",
     "rollup-plugin-node-externals": "^7.1.2",
     "semantic-release": "^24.0.0",

package/transformer.d.ts

@@ -49,7 +49,6 @@ interface TransformerPlugin {
     start?: (global: TransformerPluginGlobal) => Return<TransformerPluginGlobal>;
     run?: (context: TransformerPluginContext, global: TransformerPluginGlobal) => Return<TransformerPluginContext>;
     finish?: (global: TransformerPluginGlobal) => Return<TransformerPluginGlobal>;
-    write?: (global: TransformerPluginGlobal) => Return<TransformerPluginGlobal>;
 }
 
 declare const transformer: (...plugins: TransformerPlugin[]) => {
@@ -57,7 +56,6 @@ declare const transformer: (...plugins: TransformerPlugin[]) => {
     start: () => Promise<void>;
     run: (filePath: string) => Promise<TransformerPluginContext>;
     finish: () => Promise<void>;
-    write: () => Promise<void>;
 };
 
 declare const ASSETS_OPTIONS: Partial<AssetsOptions>;

package/transformer.js

@@ -8,13 +8,13 @@ import template from '@babel/template';
 import { pascalCase, kebabCase, camelCase, capitalCase } from 'change-case';
 import ora from 'ora';
 import path, { join, resolve, dirname } from 'node:path';
-import { COMMENT_AUTO_ADDED, DECORATOR_PROPERTY, STATIC_TAG, UTILS_STYLES_LOCAL, UTILS_PATH, DECORATOR_PROPERTY_TYPE, UTILS_STYLES_IMPORTED, ELEMENT_HOST_NAME, UTILS_HTML_IMPORTED, UTILS_HTML_LOCAL, TYPE_OBJECT, TYPE_NUMBER, TYPE_DATE, TYPE_BOOLEAN, TYPE_ARRAY, TYPE_STRING, TYPE_NULL, TYPE_ENUM, UTILS_ATTRIBUTES_IMPORTED, UTILS_ATTRIBUTES_LOCAL, DECORATOR_CSS_VARIABLE, DECORATOR_EVENT, DECORATOR_METHOD, DECORATOR_STATE, STATIC_STYLE, STYLE_IMPORTED, PACKAGE_NAME, DECORATOR_ELEMENT } from './constants.js';
+import { KEY, COMMENT_AUTO_ADDED, DECORATOR_PROPERTY, STATIC_TAG, UTILS_STYLES_LOCAL, UTILS_PATH, DECORATOR_PROPERTY_TYPE, UTILS_STYLES_IMPORTED, ELEMENT_HOST_NAME, UTILS_HTML_IMPORTED, UTILS_HTML_LOCAL, TYPE_OBJECT, TYPE_ARRAY, TYPE_NULL, TYPE_STRING, TYPE_ENUM, TYPE_NUMBER, TYPE_DATE, TYPE_BOOLEAN, UTILS_ATTRIBUTES_IMPORTED, UTILS_ATTRIBUTES_LOCAL, DECORATOR_CSS_VARIABLE, DECORATOR_EVENT, DECORATOR_METHOD, DECORATOR_STATE, STATIC_STYLE, STYLE_IMPORTED, PACKAGE_NAME, DECORATOR_ELEMENT } from './constants.js';
 
 const logger = ora({
     color: 'yellow'
 });
 const log = (message, persist) => {
-    const content = `${new Date().toLocaleTimeString()} [HTMLPLUS] ${message}`;
+    const content = `${new Date().toLocaleTimeString()} [${KEY}] ${message}`;
     const log = logger.start(content);
     if (!persist)
         return;
@@ -26,7 +26,7 @@ const transformer = (...plugins) => {
     };
     const start = async () => {
         log(`Started.`, true);
-        log(`${plugins.length} plugins found.`, true);
+        log(`${plugins.length} plugins detected.`, true);
         log(`Plugins are starting.`, true);
         for (const plugin of plugins) {
             if (!plugin.start)
@@ -35,7 +35,7 @@ const transformer = (...plugins) => {
             global = (await plugin.start(global)) || global;
             log(`Plugin '${plugin.name}' started successfully.`);
         }
-        log(`Plugins started successfully.`, true);
+        log(`Plugins have been successfully started.`, true);
     };
     const run = async (filePath) => {
         path.join(filePath).split(path.sep).pop();
@@ -74,17 +74,10 @@ const transformer = (...plugins) => {
             global = (await plugin.finish(global)) || global;
             log(`Plugin '${plugin.name}' finished successfully.`);
         }
-        log(`Plugins finished successfully.`, true);
+        log(`Plugins have been successfully finished.`, true);
         log(`Finished.`, true);
     };
-    const write = async () => {
-        for (const plugin of plugins) {
-            if (!plugin.write)
-                continue;
-            global = (await plugin.write(global)) || global;
-        }
-    };
-    return { global, start, run, finish, write };
+    return { global, start, run, finish };
 };
 
 const ASSETS_OPTIONS = {
@@ -591,45 +584,48 @@ const customElement = (options) => {
                     expression.arguments.push(t.objectExpression([]));
                 }
                 const [argument] = expression.arguments;
-                const filtered = argument.properties.filter((property) => {
-                    return property.key.name != DECORATOR_PROPERTY_TYPE;
+                const property = argument.properties.find((property) => {
+                    return property.key.name == DECORATOR_PROPERTY_TYPE;
                 });
-                if (argument.properties.length != filtered.length)
+                if (property)
                     return;
-                argument.properties = filtered;
                 let type = 0;
                 const extract = (input) => {
                     switch (input?.type) {
+                        case 'bool':
+                        case 'Boolean':
                         case 'BooleanLiteral':
+                        case 'TSBooleanKeyword':
                             type |= TYPE_BOOLEAN;
                             break;
+                        case 'Date':
+                            type |= TYPE_DATE;
+                            break;
+                        case 'Number':
                         case 'NumericLiteral':
+                        case 'TSNumberKeyword':
                             type |= TYPE_NUMBER;
                             break;
                         case 'StringLiteral':
                             type |= TYPE_ENUM;
                             break;
+                        case 'TSStringKeyword':
+                            type |= TYPE_STRING;
+                            break;
                         case 'TSArrayType':
                             type |= TYPE_ARRAY;
                             break;
-                        case 'TSBooleanKeyword':
-                            type |= TYPE_BOOLEAN;
-                            break;
                         case 'TSLiteralType':
                             extract(input.literal);
                             break;
                         case 'TSNullKeyword':
                             type |= TYPE_NULL;
                             break;
-                        case 'TSNumberKeyword':
-                            type |= TYPE_NUMBER;
-                            break;
+                        case 'Object':
                         case 'TSObjectKeyword':
                             type |= TYPE_OBJECT;
                             break;
-                        case 'TSStringKeyword':
-                            type |= TYPE_STRING;
-                            break;
+                        case 'Array':
                         case 'TSTupleType':
                             type |= TYPE_ARRAY;
                             break;
@@ -637,43 +633,23 @@ const customElement = (options) => {
                             type |= TYPE_OBJECT;
                             break;
                         case 'TSTypeReference':
-                            if (!input.typeName)
-                                break;
-                            switch (input.typeName.name) {
-                                case 'Array':
-                                    type |= TYPE_ARRAY;
-                                    break;
-                                case 'Boolean':
-                                    type |= TYPE_BOOLEAN;
-                                    break;
-                                case 'bool':
-                                    type |= TYPE_BOOLEAN;
-                                    break;
-                                case 'Date':
-                                    type |= TYPE_DATE;
-                                    break;
-                                case 'Number':
-                                    type |= TYPE_NUMBER;
-                                    break;
-                                case 'Object':
-                                    type |= TYPE_OBJECT;
-                                    break;
-                            }
+                            extract({ type: input?.typeName?.name });
                             break;
                         case 'TSUnionType':
                             input.types.forEach(extract);
                             break;
-                    }
-                    // TODO
-                    if (input?.type == 'TSParenthesizedType' &&
-                        input?.typeAnnotation?.type == 'TSIntersectionType') {
-                        let types = input.types || input.typeAnnotation.types;
-                        if (types.length != 2)
-                            return;
-                        types = types.filter((type) => type.type != 'TSTypeLiteral');
-                        if (types.length != 1)
-                            return;
-                        extract(types[0]);
+                        // TODO
+                        case 'TSParenthesizedType':
+                            if (input?.typeAnnotation?.type != 'TSIntersectionType')
+                                break;
+                            let types = input.types || input.typeAnnotation.types;
+                            if (types.length != 2)
+                                return;
+                            types = types.filter((type) => type.type != 'TSTypeLiteral');
+                            if (types.length != 1)
+                                return;
+                            extract(types[0]);
+                            break;
                     }
                 };
                 extract(getType(context.directoryPath, ast, path.parentPath.node.typeAnnotation?.typeAnnotation));
@@ -789,7 +765,7 @@ const DOCUMENT_OPTIONS = {
 const document = (options) => {
     const name = 'document';
     options = Object.assign({}, DOCUMENT_OPTIONS, options);
-    const write = (global) => {
+    const finish = (global) => {
         const json = {
             elements: []
         };
@@ -981,7 +957,7 @@ const document = (options) => {
         fs.ensureDirSync(dirname);
         fs.writeJSONSync(options.destination, json, { encoding: 'utf8', spaces: 2 });
     };
-    return { name, write };
+    return { name, finish };
 };
 
 const extract = () => {