@htmlplus/element 0.5.9 → 0.6.0

package/compiler/plugins/webTypes.js

@@ -1,13 +1,16 @@
 import { paramCase } from 'change-case';
 import fs from 'fs-extra';
 import path from 'path';
-import { getInitializer, getTags, hasTag, parseTag, print } from '../utils/index.js';
+import { getInitializer, getTags, getType, hasTag, parseTag, print } from '../utils/index.js';
 export const WEB_TYPES_OPTIONS = {};
 export const webTypes = (options) => {
     const name = 'webTypes';
     options = Object.assign({}, WEB_TYPES_OPTIONS, options);
     const finish = (global) => {
         var _a, _b, _c, _d, _e, _f, _g;
+        const contexts = global.contexts.sort((a, b) => {
+            return a.componentTag.toUpperCase() > b.componentTag.toUpperCase() ? -1 : +1;
+        });
         const json = {
             '$schema': 'http://json.schemastore.org/web-types',
             'name': options.packageName,
@@ -33,27 +36,16 @@ export const webTypes = (options) => {
                 experimental: hasTag(member, 'experimental')
             });
         };
-        for (const context of global.contexts) {
+        for (const context of contexts) {
             const attributes = (_a = context.classProperties) === null || _a === void 0 ? void 0 : _a.map((property) => {
                 var _a;
                 return Object.assign(common(property), {
                     name: paramCase(property.key['name']),
                     value: {
                         // kind: TODO
-                        /**
-                         * For Example
-                         * 01) type: "''"
-                         * 02) type: "null"
-                         * 03) type: "undefined"
-                         * 04) type: "boolean"
-                         * 05) type: "string"
-                         * 06) type: "number"
-                         * 07) type: "boolean | string | number"
-                         * 08) type: "string[]"
-                         * 09) type: "1 | 2 | 3"
-                         * 10) type: "'Value-1' | 'Value-2'"
-                         */
-                        type: print((_a = property.typeAnnotation) === null || _a === void 0 ? void 0 : _a['typeAnnotation'])
+                        type: print(getType(context.fileAST, (_a = property.typeAnnotation) === null || _a === void 0 ? void 0 : _a['typeAnnotation'], {
+                            directory: context.directoryPath
+                        }))
                         // required: TODO
                         // default: TODO
                     },

package/compiler/utils/getType.d.ts

@@ -1,2 +1,2 @@
 import { File, Node } from '@babel/types';
-export declare const getType: (file: File, node: Node, options: any) => any;
+export declare const getType: (file: File, node: Node, options: any) => Node;

package/compiler/utils/getType.js

@@ -4,7 +4,6 @@ import fs from 'fs-extra';
 import { dirname, resolve } from 'path';
 import { join } from 'path';
 import { visitor } from './visitor.js';
-// TODO: return type
 export const getType = (file, node, options) => {
     if (!node)
         return node;
@@ -68,6 +67,24 @@ export const getType = (file, node, options) => {
             if (path.node.id.name != node.typeName['name'])
                 return;
             result = path.node.typeAnnotation;
+            switch (result.type) {
+                case 'TSUnionType':
+                    const types = [];
+                    for (const prev of result.types) {
+                        const next = getType(file, prev, options);
+                        if (next.type == 'TSUnionType') {
+                            next.types.forEach((type) => types.push(type));
+                        }
+                        else {
+                            types.push(next);
+                        }
+                    }
+                    result.types = types;
+                    break;
+                default:
+                    result = getType(file, result, options);
+                    break;
+            }
             path.stop();
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@htmlplus/element",
-  "version": "0.5.9",
+  "version": "0.6.0",
   "license": "MIT",
   "author": "Masood Abdolian <m.abdolian@gmail.com>",
   "description": "A powerful library for building scalable, reusable, fast, tastable and lightweight design system for any web technologies. Powerd by Web Component.",